Imagelibrary/tinycc
1
0
Fork 0
mirror of https://github.com/TinyCC/tinycc.git synced 2025-11-16 12:34:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

tccgen: more of scope hacks

Browse Source 
* case 1: local scope of 'ff'
  int main() {
    int ff = 123;
    {
      int ff(int):
      ff(456)
    }}

* case 2: linkage of a static extern symbol
  (older gcc did allow that)
  static int ff(int);
  int main() {
    int ff(int):
    ff(456)
  }

Also:
- cleanup enum, let sym_push() handle redefinition
- just mark incomplete array base types, unshare only
  when needed (in decl_initializer_alloc())
- fix sizeof empty array (= 0) : int ii[] = {};
- rename 'Sym' members used by __attribute__((cleanup(f)))
This commit is contained in:
grischka
2025-08-23 00:56:37 +02:00
parent ce4de961af
commit 38ab5f65b3
10 changed files with 289 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tcc.h
View File

@@ -552,13 +552,17 @@ typedef struct Sym {
CType type; /* associated type */ CType type; /* associated type */
union { union {
struct Sym *next; /* next related symbol (for fields and anoms) */ struct Sym *next; /* next related symbol (for fields and anoms) */
int *e; /* expanded token stream */ int *e; /* expanded token stream with preprocessor macros */
int asm_label; /* associated asm label */ int asm_label; /* associated asm label */
struct Sym *cleanupstate; /* in defined labels */ struct Sym *cleanupstate; /* in defined labels */
int *vla_array_str; /* vla array code */ int *vla_array_str; /* vla array code */
}; };
struct Sym *prev; /* prev symbol in stack */ struct Sym *prev; /* prev symbol in stack */
struct Sym *prev_tok; /* previous symbol for this token */ union {
struct Sym *prev_tok; /* previous symbol for this token */
struct Sym *cleanup_sym; /* symbol from __attribute__((cleanup())) */
struct Sym *cleanup_label; /* label in 'pending_gotos' chain */
};
} Sym; } Sym;
/* section definition */ /* section definition */
@@ -1074,7 +1078,7 @@ struct filespec {
#define VT_UNION (1 << VT_STRUCT_SHIFT | VT_STRUCT) #define VT_UNION (1 << VT_STRUCT_SHIFT | VT_STRUCT)
#define VT_ENUM (2 << VT_STRUCT_SHIFT) /* integral type is an enum really */ #define VT_ENUM (2 << VT_STRUCT_SHIFT) /* integral type is an enum really */
#define VT_ENUM_VAL (4 << VT_STRUCT_SHIFT) /* integral type is an enum constant really */ #define VT_ENUM_VAL (3 << VT_STRUCT_SHIFT) /* integral type is an enum constant really */
#define IS_ENUM(t) ((t & VT_STRUCT_MASK) == VT_ENUM) #define IS_ENUM(t) ((t & VT_STRUCT_MASK) == VT_ENUM)
#define IS_ENUM_VAL(t) ((t & VT_STRUCT_MASK) == VT_ENUM_VAL) #define IS_ENUM_VAL(t) ((t & VT_STRUCT_MASK) == VT_ENUM_VAL)
@@ -1087,9 +1091,13 @@ struct filespec {
#define VT_TYPE (~(VT_STORAGE|VT_STRUCT_MASK)) #define VT_TYPE (~(VT_STORAGE|VT_STRUCT_MASK))
/* symbol was created by tccasm.c first */ /* symbol was created by tccasm.c first */
#define VT_ASM (VT_VOID | 1 << VT_STRUCT_SHIFT) #define VT_ASM (VT_VOID | 4 << VT_STRUCT_SHIFT)
#define VT_ASM_FUNC (VT_ASM | 2 << VT_STRUCT_SHIFT) #define VT_ASM_FUNC (VT_VOID | 5 << VT_STRUCT_SHIFT)
#define IS_ASM_SYM(sym) (((sym)->type.t & (VT_BTYPE | VT_ASM)) == VT_ASM) #define IS_ASM_SYM(sym) (((sym)->type.t & ((VT_BTYPE|VT_STRUCT_MASK) & ~(1<<VT_STRUCT_SHIFT))) == VT_ASM)
#define IS_ASM_FUNC(t) ((t & (VT_BTYPE|VT_STRUCT_MASK)) == VT_ASM_FUNC)
/* base type is array (from typedef/typeof) */
#define VT_BT_ARRAY (6 << VT_STRUCT_SHIFT)
/* general: set/get the pseudo-bitfield value for bit-mask M */ /* general: set/get the pseudo-bitfield value for bit-mask M */
#define BFVAL(M,N) ((unsigned)((M) & ~((M) << 1)) * (N)) #define BFVAL(M,N) ((unsigned)((M) & ~((M) << 1)) * (N))

2
tccasm.c
View File

@@ -842,7 +842,7 @@ static void asm_parse_directive(TCCState *s1, int global)
if (!strcmp(newtype, "function") || !strcmp(newtype, "STT_FUNC")) { if (!strcmp(newtype, "function") || !strcmp(newtype, "STT_FUNC")) {
if (IS_ASM_SYM(sym)) if (IS_ASM_SYM(sym))
sym->type.t = (sym->type.t & ~VT_ASM) | VT_ASM_FUNC; sym->type.t |= VT_ASM_FUNC;
st_type = STT_FUNC; st_type = STT_FUNC;
set_st_type: set_st_type:
if (sym->c) { if (sym->c) {

255
tccgen.c
View File

@@ -341,8 +341,8 @@ ST_FUNC void check_vstack(void)
(int)(vtop - vstack + 1)); (int)(vtop - vstack + 1));
} }
/* vstack debugging aid */
#if 0 #if 0
/* dump 'b' vstack entries starting with 'a' */
void pv (const char *lbl, int a, int b) void pv (const char *lbl, int a, int b)
{ {
int i; int i;
@@ -352,6 +352,27 @@ void pv (const char *lbl, int a, int b)
lbl, i, p->type.t, p->r, p->r2, (int)p->c.i); lbl, i, p->type.t, p->r, p->r2, (int)p->c.i);
} }
} }
/* dump symbols on stack from s ... last */
static inline void psyms(const char *msg, Sym *s, Sym *last)
{
printf("%-8s scope v c r type.t\n", msg);
while (s && s != last) {
printf(" %8x %08x %08x %08x %08x %s\n",
s->sym_scope, s->v, s->c, s->r, s->type.t, get_tok_str(s->v, 0));
s = s->prev;
}
}
static void type_to_str(char *buf, int buf_size, CType *type, const char *varstr);
/* print type */
static void ptype(CType *type, int v)
{
char buf[500];
type_to_str(buf, sizeof(buf), type, get_tok_str(v, NULL));
printf("type = '%s'\n", buf);
}
#endif #endif
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
@@ -506,7 +527,7 @@ ST_FUNC void put_extern_sym2(Sym *sym, int sh_num,
sym_type = STT_FUNC; sym_type = STT_FUNC;
} else if ((t & VT_BTYPE) == VT_VOID) { } else if ((t & VT_BTYPE) == VT_VOID) {
sym_type = STT_NOTYPE; sym_type = STT_NOTYPE;
if ((t & (VT_BTYPE|VT_ASM_FUNC)) == VT_ASM_FUNC) if (IS_ASM_FUNC(t))
sym_type = STT_FUNC; sym_type = STT_FUNC;
} else { } else {
sym_type = STT_OBJECT; sym_type = STT_OBJECT;
@@ -575,8 +596,18 @@ ST_FUNC void greloca(Section *s, Sym *sym, unsigned long offset, int type,
return; return;
if (sym) { if (sym) {
if (0 == sym->c) if (0 == sym->c) {
put_extern_sym(sym, NULL, 0, 0); put_extern_sym(sym, NULL, 0, 0);
if (sym->sym_scope
&& (sym->type.t & (VT_STATIC|VT_EXTERN)) == (VT_STATIC|VT_EXTERN)) {
/* when a local function declaraion redeclares a global static one
then tccelf would not resolve them to the same symbol. */
Sym *s = sym;
while (s->prev_tok)
s = s->prev_tok;
s->c = sym->c;
}
}
c = sym->c; c = sym->c;
} }
@@ -683,6 +714,13 @@ ST_INLN Sym *sym_find(int v)
return table_ident[v]->sym_identifier; return table_ident[v]->sym_identifier;
} }
static int sym_scope_e(Sym *s)
{
return IS_ENUM_VAL (s->type.t)
? s->type.ref->sym_scope
: s->sym_scope;
}
/* make sym in-/visible to the parser */ /* make sym in-/visible to the parser */
static inline void sym_link(Sym *s, int yes) static inline void sym_link(Sym *s, int yes)
{ {
@@ -692,10 +730,14 @@ static inline void sym_link(Sym *s, int yes)
ps = &ts->sym_struct; ps = &ts->sym_struct;
else else
ps = &ts->sym_identifier; ps = &ts->sym_identifier;
if (yes) if (yes) {
if (*ps && sym_scope_e(*ps) == local_scope)
tcc_error("redeclaration of '%s'", get_tok_str(s->v, NULL));
s->prev_tok = *ps, *ps = s; s->prev_tok = *ps, *ps = s;
else s->sym_scope = local_scope;
} else {
*ps = s->prev_tok; *ps = s->prev_tok;
}
} }
/* push a given symbol on the symbol stack */ /* push a given symbol on the symbol stack */
@@ -710,18 +752,9 @@ ST_FUNC Sym *sym_push(int v, CType *type, int r, int c)
s->type.ref = type->ref; s->type.ref = type->ref;
s->r = r; s->r = r;
/* don't record fields or anonymous symbols */ /* don't record fields or anonymous symbols */
/* XXX: simplify */
if ((v & ~SYM_STRUCT) < SYM_FIRST_ANOM) { if ((v & ~SYM_STRUCT) < SYM_FIRST_ANOM) {
/* record symbol in token array */ /* record symbol in token array */
sym_link(s, 1); sym_link(s, 1);
s->sym_scope = local_scope;
if (s->prev_tok
&& (IS_ENUM_VAL (s->prev_tok->type.t)
? s->prev_tok->type.ref->sym_scope
: s->prev_tok->sym_scope)
== s->sym_scope)
tcc_error("redeclaration of '%s'",
get_tok_str(v & ~SYM_STRUCT, NULL));
} }
return s; return s;
} }
@@ -824,19 +857,6 @@ ST_FUNC void label_pop(Sym **ptop, Sym *slast, int keep)
*ptop = slast; *ptop = slast;
} }
#if 0
/* debug: print symbols on stack from s ... last */
static inline void psyms(const char *msg, Sym *s, Sym *last)
{
printf("%-8s scope v c r type.t\n", msg);
while (s && s != last) {
printf(" %8x %08x %08x %08x %08x %s\n",
s->sym_scope, s->v, s->c, s->r, s->type.t, get_tok_str(s->v, 0));
s = s->prev;
}
}
#endif
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
static void vcheck_cmp(void) static void vcheck_cmp(void)
{ {
@@ -1294,27 +1314,47 @@ static Sym *sym_copy(Sym *s0, Sym **ps)
Sym *s; Sym *s;
s = sym_malloc(), *s = *s0; s = sym_malloc(), *s = *s0;
s->prev = *ps, *ps = s; s->prev = *ps, *ps = s;
if ((s->v & ~SYM_STRUCT) < SYM_FIRST_ANOM && ps == &local_stack) if ((s->v & ~SYM_STRUCT) < SYM_FIRST_ANOM)
sym_link(s, 1); sym_link(s, 1);
return s; return s;
} }
/* Symbol 's' was locally declared 'extern' (or as function), and /* Symbol 's' was locally declared 'extern' (or as function), and is
is on global_stack. Now must copy its 'ref' to global_stack too */ on global_stack. Now must copy its 'ref' to global_stack too */
static void sym_copy_ref(Sym *s, Sym **ps) static void move_ref_to_global(Sym *s)
{ {
int bt = s->type.t & VT_BTYPE; Sym *l, **lp;
if (bt == VT_PTR int n, bt;
|| bt == VT_FUNC
|| ((bt == VT_STRUCT || IS_ENUM(s->type.t)) bt = s->type.t & VT_BTYPE;
&& s->type.ref if (!(bt == VT_PTR
&& s->type.ref->sym_scope)) { || bt == VT_FUNC
Sym **sp = &s->type.ref; || bt == VT_STRUCT
for (s = *sp, *sp = NULL; s; s = s->next) { || (IS_ENUM(s->type.t)) && (bt = VT_ENUM,1)))
Sym *s2 = sym_copy(s, ps); return;
sp = &(*sp = s2)->next;
sym_copy_ref(s2, ps); for (s = s->type.ref, n = 0; s; s = s->next) {
for (lp = &local_stack; !!(l = *lp); lp = &l->prev) {
if (l == s) {
*lp = s->prev;
s->prev = global_stack, global_stack = s;
if (n || bt == VT_PTR) {
move_ref_to_global(s);
} else {
if ((bt == VT_STRUCT || bt == VT_ENUM)
&& (s->v & ~SYM_STRUCT) < SYM_FIRST_ANOM) {
/* copy struct/enum tag to local scope */
s->v |= SYM_FIELD;
l = sym_copy(s, lp);
l->v &= ~SYM_FIELD;
}
n = 1;
}
break;
}
} }
if (n == 0) /* no next (VT_PTR) or ref not on local_stack */
break;
} }
} }
@@ -1335,15 +1375,15 @@ static Sym *external_sym(int v, CType *type, int r, AttributeDef *ad)
s->a = ad->a; s->a = ad->a;
s->asm_label = ad->asm_label; s->asm_label = ad->asm_label;
s->type.ref = type->ref; s->type.ref = type->ref;
/* copy type to the global stack */
if (local_stack)
sym_copy_ref(s, &global_stack);
} else { } else {
patch_storage(s, ad, type); patch_storage(s, ad, type);
} }
/* push variables on local_stack if any */ if (local_stack) {
if (local_stack && (s->type.t & VT_BTYPE) != VT_FUNC) /* make sure that type->ref is on global stack */
move_ref_to_global(s);
/* put into local scope */
s = sym_copy(s, &local_stack); s = sym_copy(s, &local_stack);
}
return s; return s;
} }
@@ -3457,8 +3497,8 @@ ST_FUNC int type_size(CType *type, int *a)
int ts; int ts;
s = type->ref; s = type->ref;
ts = type_size(&s->type, a); ts = type_size(&s->type, a);
if (ts < 0 && s->c < 0) if (s->c < 0)
ts = -ts; return s->c;
return ts * s->c; return ts * s->c;
} else { } else {
*a = PTR_SIZE; *a = PTR_SIZE;
@@ -4367,6 +4407,15 @@ static void struct_layout(CType *type, AttributeDef *ad)
} }
} }
/* Does 'n' fit into integer type 't' ? */
static int in_range(long long n, int t)
{
unsigned long long m = (1ULL << (btype_size(t & VT_BTYPE) * 8 - 1)) - 1;
if (t & VT_UNSIGNED)
return n <= (m << 1) + 1;
return n >= -(long long)m - 1 && n <= (long long)m;
}
/* enum/struct/union declaration. u is VT_ENUM/VT_STRUCT/VT_UNION */ /* enum/struct/union declaration. u is VT_ENUM/VT_STRUCT/VT_UNION */
static void struct_decl(CType *type, int u) static void struct_decl(CType *type, int u)
{ {
@@ -4431,36 +4480,26 @@ do_decl:
/* non empty enums are not allowed */ /* non empty enums are not allowed */
ps = &s->next; ps = &s->next;
if (u == VT_ENUM) { if (u == VT_ENUM) {
long long ll = 0, pl = 0, nl = 0, ni = 0, pi = 0; long long ll = 0, pl = 0, nl = 0;
unsigned long long mu = 0;
CType t; CType t;
t.ref = s; t.ref = s;
s->sym_scope = local_scope; /* anonymous symbol won't have set */
/* enum symbols have static storage */ /* enum symbols have static storage */
t.t = VT_INT|VT_STATIC|VT_ENUM_VAL; t.t = VT_INT|VT_STATIC|VT_ENUM_VAL;
if (bt) { if (bt)
t.t = bt|VT_STATIC|VT_ENUM_VAL; t.t = bt|VT_STATIC|VT_ENUM_VAL;
mu = 1llu << (type_size(&t, &align) * 8 - 1);
pi = mu - 1;
ni = -mu;
mu = (mu << 1) - 1u;
}
for(;;) { for(;;) {
v = tok; v = tok;
if (v < TOK_UIDENT) if (v < TOK_UIDENT)
expect("identifier"); expect("identifier");
ss = sym_find(v);
if (ss && !local_stack)
tcc_error("redefinition of enumerator '%s'",
get_tok_str(v, NULL));
next(); next();
if (tok == '=') { if (tok == '=') {
next(); next();
ll = expr_const64(); ll = expr_const64();
} }
if (bt && (t.t & VT_UNSIGNED ? (unsigned long long)ll > mu if (bt && !in_range(ll, t.t))
: ll < ni || ll > pi)) tcc_error("enumerator '%s' out of range of its type",
tcc_error("enumerator value outside the range of underlying type '%s'", get_tok_str(v, NULL));
get_tok_str(v, NULL));
ss = sym_push(v, &t, VT_CONST, 0); ss = sym_push(v, &t, VT_CONST, 0);
ss->enum_val = ll; ss->enum_val = ll;
*ps = ss, ps = &ss->next; *ps = ss, ps = &ss->next;
@@ -4626,9 +4665,9 @@ do_decl:
check_fields(type, 1); check_fields(type, 1);
check_fields(type, 0); check_fields(type, 0);
struct_layout(type, &ad); struct_layout(type, &ad);
if (debug_modes)
tcc_debug_fix_forw(tcc_state, type);
} }
if (debug_modes)
tcc_debug_fix_forw(tcc_state, type);
} }
} }
@@ -4860,8 +4899,11 @@ static int parse_btype(CType *type, AttributeDef *ad, int ignore_label)
parse_expr_type(&type1); parse_expr_type(&type1);
/* remove all storage modifiers except typedef */ /* remove all storage modifiers except typedef */
type1.t &= ~(VT_STORAGE&~VT_TYPEDEF); type1.t &= ~(VT_STORAGE&~VT_TYPEDEF);
if (type1.ref) if (type1.ref) {
sym_to_attr(ad, type1.ref); sym_to_attr(ad, type1.ref);
if (type1.t & VT_ARRAY)
type1.t |= VT_BT_ARRAY;
}
goto basic_type2; goto basic_type2;
case TOK_THREAD_LOCAL: case TOK_THREAD_LOCAL:
tcc_error("_Thread_local is not implemented"); tcc_error("_Thread_local is not implemented");
@@ -4886,12 +4928,12 @@ static int parse_btype(CType *type, AttributeDef *ad, int ignore_label)
if (t) if (t)
parse_btype_qualify(type, t); parse_btype_qualify(type, t);
t = type->t; t = type->t;
if (t & VT_ARRAY)
t |= VT_BT_ARRAY;
/* get attributes from typedef */ /* get attributes from typedef */
sym_to_attr(ad, s); sym_to_attr(ad, s);
typespec_found = 1; typespec_found = 1;
st = bt = -2; st = bt = -2;
if (type->ref && (t & VT_ARRAY) && type->ref->c < 0)
type->ref = sym_push(SYM_FIELD, &type->ref->type, 0, type->ref->c);
break; break;
} }
type_found = 1; type_found = 1;
@@ -4994,15 +5036,15 @@ static int post_type(CType *type, AttributeDef *ad, int storage, int td)
type_decl(&pt, &ad1, &n, TYPE_DIRECT | TYPE_ABSTRACT | TYPE_PARAM); type_decl(&pt, &ad1, &n, TYPE_DIRECT | TYPE_ABSTRACT | TYPE_PARAM);
if ((pt.t & VT_BTYPE) == VT_VOID) if ((pt.t & VT_BTYPE) == VT_VOID)
tcc_error("parameter declared as void"); tcc_error("parameter declared as void");
if (local_scope > 1 || n == 0) if (n == 0 || (td & TYPE_PARAM))
n = SYM_FIELD; n |= SYM_FIELD;
} else { } else {
n = tok; n = tok;
pt.t = VT_INT | VT_EXTERN; /* default type */ pt.t = VT_INT | VT_EXTERN; /* default type */
pt.ref = NULL; pt.ref = NULL;
next(); next();
} }
if (local_scope == 1 && n < TOK_UIDENT) if (n < TOK_UIDENT)
expect("identifier"); expect("identifier");
convert_parameter_type(&pt); convert_parameter_type(&pt);
arg_size += (type_size(&pt, &align) + PTR_SIZE - 1) / PTR_SIZE; arg_size += (type_size(&pt, &align) + PTR_SIZE - 1) / PTR_SIZE;
@@ -5026,7 +5068,6 @@ static int post_type(CType *type, AttributeDef *ad, int storage, int td)
/* if no parameters, then old type prototype */ /* if no parameters, then old type prototype */
l = FUNC_OLD; l = FUNC_OLD;
skip(')'); skip(')');
--local_scope;
/* NOTE: const is ignored in returned type as it has a special /* NOTE: const is ignored in returned type as it has a special
meaning in gcc / C++ */ meaning in gcc / C++ */
type->t &= ~VT_CONSTANT; type->t &= ~VT_CONSTANT;
@@ -5046,10 +5087,9 @@ static int post_type(CType *type, AttributeDef *ad, int storage, int td)
s->next = first; s->next = first;
type->t = VT_FUNC; type->t = VT_FUNC;
type->ref = s; type->ref = s;
/* unlink parameter symbols from the token table, keep on stack */
/* unlink symbols from the token table, keep on stack */
sym_pop(ps, sr, 1); sym_pop(ps, sr, 1);
//psyms("---", *ps, sr); --local_scope;
} else if (tok == '[') { } else if (tok == '[') {
int saved_nocode_wanted = nocode_wanted; int saved_nocode_wanted = nocode_wanted;
@@ -6901,7 +6941,7 @@ static void try_call_scope_cleanup(Sym *stop)
Sym *cls = cur_scope->cl.s; Sym *cls = cur_scope->cl.s;
for (; cls != stop; cls = cls->next) { for (; cls != stop; cls = cls->next) {
Sym *fs = cls->cleanup_func; Sym *fs = cls->cleanup_func;
Sym *vs = cls->prev_tok; Sym *vs = cls->cleanup_sym;
save_lvalues(); save_lvalues();
vpushsym(&fs->type, fs); vpushsym(&fs->type, fs);
vset(&vs->type, vs->r, vs->c); vset(&vs->type, vs->r, vs->c);
@@ -6912,6 +6952,7 @@ static void try_call_scope_cleanup(Sym *stop)
} }
} }
static void try_call_cleanup_goto(Sym *cleanupstate) static void try_call_cleanup_goto(Sym *cleanupstate)
{ {
Sym *oc, *cc; Sym *oc, *cc;
@@ -6938,7 +6979,7 @@ static void block_cleanup(struct scope *o)
int jmp = 0; int jmp = 0;
Sym *g, **pg; Sym *g, **pg;
for (pg = &pending_gotos; (g = *pg) && g->c > o->cl.n;) { for (pg = &pending_gotos; (g = *pg) && g->c > o->cl.n;) {
if (g->prev_tok->r & LABEL_FORWARD) { if (g->cleanup_label->r & LABEL_FORWARD) {
Sym *pcl = g->next; Sym *pcl = g->next;
if (!jmp) if (!jmp)
jmp = gjmp(0); jmp = gjmp(0);
@@ -7360,7 +7401,7 @@ again:
/* start new goto chain for cleanups, linked via label->next */ /* start new goto chain for cleanups, linked via label->next */
if (cur_scope->cl.s && !nocode_wanted) { if (cur_scope->cl.s && !nocode_wanted) {
sym_push2(&pending_gotos, SYM_FIELD, 0, cur_scope->cl.n); sym_push2(&pending_gotos, SYM_FIELD, 0, cur_scope->cl.n);
pending_gotos->prev_tok = s; pending_gotos->cleanup_label = s;
s = sym_push2(&s->next, SYM_FIELD, 0, 0); s = sym_push2(&s->next, SYM_FIELD, 0, 0);
pending_gotos->next = s; pending_gotos->next = s;
} }
@@ -7570,7 +7611,7 @@ static void decl_design_flex(init_params *p, Sym *ref, int index)
if (ref == p->flex_array_ref) { if (ref == p->flex_array_ref) {
if (index >= ref->c) if (index >= ref->c)
ref->c = index + 1; ref->c = index + 1;
} else if (ref->c < 0) } else if (ref->c < 0 && index >= 0)
tcc_error("flexible array has zero size in this context"); tcc_error("flexible array has zero size in this context");
} }
@@ -8029,7 +8070,7 @@ static void decl_initializer(init_params *p, CType *type, unsigned long c, int f
/* GNU extension: if the initializer is empty for a flex array, /* GNU extension: if the initializer is empty for a flex array,
it's size is zero. We won't enter the loop, so set the size it's size is zero. We won't enter the loop, so set the size
now. */ now. */
decl_design_flex(p, s, len); decl_design_flex(p, s, len - 1);
while (tok != '}' || (flags & DIF_HAVE_ELEM)) { while (tok != '}' || (flags & DIF_HAVE_ELEM)) {
len = decl_designator(p, type, c, &f, flags, len); len = decl_designator(p, type, c, &f, flags, len);
flags &= ~DIF_HAVE_ELEM; flags &= ~DIF_HAVE_ELEM;
@@ -8165,6 +8206,13 @@ static void decl_initializer_alloc(CType *type, AttributeDef *ad, int r,
// (arrays of incomplete types are handled in array parsing) // (arrays of incomplete types are handled in array parsing)
if (!(type->t & VT_ARRAY)) if (!(type->t & VT_ARRAY))
tcc_error("initialization of incomplete type"); tcc_error("initialization of incomplete type");
/* If the base type itself was an array type of unspecified
size (like in 'typedef int arr[]; arr x = {1};') then
we will overwrite the unknown size by the real one for
this decl. We need to unshare the ref symbol holding
that size. */
if (type->t & VT_BT_ARRAY)
type->ref = sym_push(SYM_FIELD, &type->ref->type, 0, type->ref->c);
p.flex_array_ref = type->ref; p.flex_array_ref = type->ref;
} else if (has_init && (type->t & VT_BTYPE) == VT_STRUCT) { } else if (has_init && (type->t & VT_BTYPE) == VT_STRUCT) {
@@ -8182,8 +8230,8 @@ static void decl_initializer_alloc(CType *type, AttributeDef *ad, int r,
if (size < 0) { if (size < 0) {
/* If unknown size, do a dry-run 1st pass */ /* If unknown size, do a dry-run 1st pass */
if (!has_init) if (!has_init)
tcc_error("unknown type size"); goto err_size;
if (has_init == 2) { if (has_init == 2) {
/* only get strings */ /* only get strings */
init_str = tok_str_alloc(); init_str = tok_str_alloc();
@@ -8206,7 +8254,8 @@ static void decl_initializer_alloc(CType *type, AttributeDef *ad, int r,
/* if still unknown size, error */ /* if still unknown size, error */
size = type_size(type, &align); size = type_size(type, &align);
if (size < 0) if (size < 0)
err_size:
tcc_error("unknown type size"); tcc_error("unknown type size");
/* If there's a flex member and it was used in the initializer /* If there's a flex member and it was used in the initializer
@@ -8258,7 +8307,7 @@ static void decl_initializer_alloc(CType *type, AttributeDef *ad, int r,
if (ad->cleanup_func) { if (ad->cleanup_func) {
Sym *cls = sym_push2(&all_cleanups, Sym *cls = sym_push2(&all_cleanups,
SYM_FIELD | ++cur_scope->cl.n, 0, 0); SYM_FIELD | ++cur_scope->cl.n, 0, 0);
cls->prev_tok = sym; cls->cleanup_sym = sym;
cls->cleanup_func = ad->cleanup_func; cls->cleanup_func = ad->cleanup_func;
cls->next = cur_scope->cl.s; cls->next = cur_scope->cl.s;
cur_scope->cl.s = cls; cur_scope->cl.s = cls;
@@ -8423,19 +8472,21 @@ ST_FUNC Sym *gfunc_set_param(Sym *s, int c, int byref)
return NULL; return NULL;
s->c = c; s->c = c;
if (byref) if (byref)
s->r = VT_LLOCAL | VT_LVAL; s->r = VT_LLOCAL | VT_LVAL; /* otherwise VT_LOCAL */
return s; return s;
} }
/* push parameters (and their types), last first */ /* push parameters (and their types), last first */
static void sym_push_params(Sym *ref) static void sym_push_params(Sym *ref)
{ {
Sym *s; Sym *s = ref;
for (s = ref; s->next; s = s->next) while (s->next)
; s = s->next;
for (; s && s != ref; s = s->prev) while (s != ref) {
if ((s->v & ~SYM_STRUCT) < SYM_FIRST_ANOM) if ((s->v & ~SYM_STRUCT) < SYM_FIRST_ANOM)
sym_copy(s, &local_stack); sym_copy(s, &local_stack);
s = s->prev;
}
} }
/* parse a function defined by symbol 'sym' and generate its code in /* parse a function defined by symbol 'sym' and generate its code in
@@ -8473,8 +8524,8 @@ static void gen_function(Sym *sym)
/* push a dummy symbol to enable local sym storage */ /* push a dummy symbol to enable local sym storage */
sym_push2(&local_stack, SYM_FIELD, 0, 0); sym_push2(&local_stack, SYM_FIELD, 0, 0);
/* push parameters */ /* push parameters */
local_scope = 1;
sym_push_params(sym->type.ref); sym_push_params(sym->type.ref);
//psyms(funcname, local_stack, 0);
local_scope = 0; local_scope = 0;
rsym = 0; rsym = 0;
@@ -8608,7 +8659,7 @@ static int decl(int l)
{ {
int v, has_init, r, oldint; int v, has_init, r, oldint;
CType type, btype; CType type, btype;
Sym *sym; Sym *sym, *sa;
AttributeDef ad, adbase; AttributeDef ad, adbase;
ElfSym *esym; ElfSym *esym;
@@ -8663,22 +8714,8 @@ static int decl(int l)
while (1) { /* iterate thru each declaration */ while (1) { /* iterate thru each declaration */
type = btype; type = btype;
ad = adbase; ad = adbase;
if ((btype.t & VT_ARRAY) && btype.ref->c < 0) {
/* If the base type itself was an array type of unspecified
size (like in 'typedef int arr[]; arr x = {1};') then
we will overwrite the unknown size by the real one for
this decl. We need to unshare the ref symbol holding
that size. */
type.ref = sym_push(SYM_FIELD, &type.ref->type, 0, type.ref->c);
}
type_decl(&type, &ad, &v, TYPE_DIRECT); type_decl(&type, &ad, &v, TYPE_DIRECT);
#if 0
{
char buf[500];
type_to_str(buf, sizeof(buf), &type, get_tok_str(v, NULL));
printf("type = '%s'\n", buf);
}
#endif
if ((type.t & VT_BTYPE) == VT_FUNC) { if ((type.t & VT_BTYPE) == VT_FUNC) {
if ((type.t & VT_STATIC) && (l != VT_CONST)) if ((type.t & VT_STATIC) && (l != VT_CONST))
tcc_error("function without file scope cannot be static"); tcc_error("function without file scope cannot be static");
@@ -8722,8 +8759,6 @@ static int decl(int l)
pe_check_linkage(&type, &ad); pe_check_linkage(&type, &ad);
#endif #endif
if (tok == '{') { if (tok == '{') {
Sym *sa;
if (l != VT_CONST) if (l != VT_CONST)
tcc_error("cannot use local functions"); tcc_error("cannot use local functions");
if ((type.t & VT_BTYPE) != VT_FUNC) if ((type.t & VT_BTYPE) != VT_FUNC)

93
tests/tests2/129_scopes.c
View File

@@ -77,40 +77,101 @@ struct st func(void)
} }
/* --------------------------------------------- */ /* --------------------------------------------- */
static void func2(char *(*md)(char *md)) /* func* 'md' must not be shadowed by param 'md' */
static void f4(char *(*md)(char *md))
{ {
(*md)("test"); (*md)("test");
} }
static char *a4(char *a)
static char *a(char *a)
{ {
printf("%s\n", a); int strcmp();
myassert(!strcmp(a, "test"));
return a; return a;
} }
int main_4(void) int main_4()
{ {
func2(a); f4(a4);
return 0; return 0;
} }
/* --------------------------------------------- */ /* --------------------------------------------- */
int b[3]; int a5[3], b5[];
int f(void); int f5(void);
int main_5()
int main_5(void)
{ {
extern int b[3]; extern int a5[3], b5[3];
b[2]=10; a5[2]=10, b5[2]=4;
printf("%d\n", f()); myassert(f5() == 10 + 4);
return 0;
}
int f5(void)
{
return a5[2]+b5[2];
}
int b5[3];
/* --------------------------------------------- */
static int f6(int);
int i6 = 11;
int main_6()
{
{
int i6 = 33, f6 = 44;
myassert(i6 == 33 && f6 == 44);
{
int f6(int);
extern int i6;
myassert(i6 == 11 && f6(22) == 22);
}
myassert(i6 == 33 && f6 == 44);
}
myassert(i6 == 11 && f6(22) == 22);
return 0; return 0;
} }
int f(void) int f6(int x)
{ {
return b[2]==10 ? 1 : 0; return x;
} }
/* --------------------------------------------- */
#if defined __TINYC__ \
? !defined __leading_underscore \
: !(defined __APPLE__ || defined _WIN32)
# define _
#else
# define _ "_"
#endif
struct xx7 { int a, b; };
void f7()
{
struct xx7 { int c; } x;
{
extern struct xx7 { int a, b; } x __asm__(_"z7");
x.a = 12;
struct xx7 y = { 0,0 };
}
struct xx7 y = { 90 };
x.c = 78;
printf("xx7 (1) : %d %d\n", x.c, y.c);
}
int main_7()
{
f7();
extern struct xx7 y __asm__(_"z7");
printf("xx7 (2) : %d %d\n", y.a, y.b);
return 0;
}
struct xx7 z7 = { 0, 34 };
/* --------------------------------------------- */ /* --------------------------------------------- */
int main() int main()
{ {
@@ -119,5 +180,7 @@ int main()
main_3(); main_3();
main_4(); main_4();
main_5(); main_5();
main_6();
main_7();
return 0; return 0;
} }

10
tests/tests2/129_scopes.expect
View File

@@ -21,5 +21,11 @@
129_scopes.c:43: ok : "!in" 129_scopes.c:43: ok : "!in"
129_scopes.c:59: ok : "c == 'a'" 129_scopes.c:59: ok : "c == 'a'"
129_scopes.c:69: ok : "st.a == 10" 129_scopes.c:69: ok : "st.a == 10"
test 129_scopes.c:88: ok : "!strcmp(a, "test")"
1 129_scopes.c:105: ok : "f5() == 10 + 4"
129_scopes.c:122: ok : "i6 == 33 && f6 == 44"
129_scopes.c:126: ok : "i6 == 11 && f6(22) == 22"
129_scopes.c:128: ok : "i6 == 33 && f6 == 44"
129_scopes.c:130: ok : "i6 == 11 && f6(22) == 22"
xx7 (1) : 78 90
xx7 (2) : 12 34

32
tests/tests2/35_sizeof.c
View File

@@ -1,14 +1,30 @@
#include <stdio.h> int printf(const char*, ...);
int main() int main()
{ {
char a; char a;
short b; short b;
printf("%d %d\n", sizeof(char), sizeof(a)); printf("sizeof a : %d %d\n", sizeof(char), sizeof(a));
printf("%d %d\n", sizeof(short), sizeof(b)); printf("sizeof b : %d %d\n", sizeof(short), sizeof(b));
return 0; int ii[] = {}; /* gnu extension, size = 0 */
printf("sizeof ii : %d\n", sizeof ii);
int kk[] = { 1 };
printf("sizeof kk : %d\n", sizeof kk);
char cc[] = "12";
printf("sizeof cc : %d\n", sizeof cc);
__WCHAR_TYPE__ ll[] = L"12345";
printf("len-of ll : %d\n", sizeof ll / sizeof ll[0]);
static struct {
int a,b,c;
int d[];
} ss[] = {{ 1, 2, 3, {} }};
printf("sizeof ss : %d\n", sizeof ss);
return 0;
} }
/* vim: set expandtab ts=4 sw=3 sts=3 tw=80 :*/

9
tests/tests2/35_sizeof.expect
View File

@@ -1,2 +1,7 @@
1 1 sizeof a : 1 1
2 2 sizeof b : 2 2
sizeof ii : 0
sizeof kk : 4
sizeof cc : 3
len-of ll : 6
sizeof ss : 12

9
tests/tests2/39_typedef.c
View File

@@ -13,6 +13,7 @@ typedef struct FunStruct MyFunStruct;
typedef MyFunStruct *MoreFunThanEver; typedef MyFunStruct *MoreFunThanEver;
typedef int t[]; typedef int t[];
int tints[];
int main() int main()
{ {
@@ -36,6 +37,14 @@ int main()
printf("%d\n", (int)sizeof((t){1,2,3})); printf("%d\n", (int)sizeof((t){1,2,3}));
printf("%d\n", (int)sizeof((t){1,2,3,4})); printf("%d\n", (int)sizeof((t){1,2,3,4}));
/* two arrays derived from same base type */
t t3 = { 1,2,3 }, t4 = { 4,5,6,7 };
for (p = t3, i = 0; i < 3 ; i++) printf("%d ", *p++);
for (p = t4, i = 0; i < 4 ; i++) printf("%d ", *p++); printf("\n");
typeof(tints) t5 = { 1,2,3 }, t6 = { 4,5,6,7 };
for (p = t5, i = 0; i < 3 ; i++) printf("%d ", *p++);
for (p = t6, i = 0; i < 4 ; i++) printf("%d ", *p++); printf("\n");
return 0; return 0;
} }

2
tests/tests2/39_typedef.expect
View File

@@ -5,3 +5,5 @@
1 2 3 4 1 2 3 4
12 12
16 16
1 2 3 4 5 6 7
1 2 3 4 5 6 7

2
tests/tests2/60_errors_and_warnings.expect
View File

@@ -17,7 +17,7 @@
60_errors_and_warnings.c:21: error: struct/union/enum already defined 60_errors_and_warnings.c:21: error: struct/union/enum already defined
[test_62_enumerator_redefinition] [test_62_enumerator_redefinition]
60_errors_and_warnings.c:26: error: redefinition of enumerator 'RED' 60_errors_and_warnings.c:26: error: redeclaration of 'RED'
[test_63_local_enumerator_redefinition] [test_63_local_enumerator_redefinition]
[returns 1] [returns 1]