d0p1/tcc-stupidos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Disable C99 VLA when alloca is unavailable."

Browse source 
This reverts commit e3e5d4ad7a.
This commit is contained in:
Thomas Preud'homme 2011-02-05 02:31:11 +01:00
parent b0c50fbd4d
commit 4b8470f3ae
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tccgen.c
View file

@ -3162,21 +3162,17 @@ static void post_type(CType *type, AttributeDef *ad)
n = -1; n = -1;
if (tok != ']') { if (tok != ']') {
gexpr(); gexpr();
#ifdef TOK_alloca
if ((vtop->r & (VT_VALMASK | VT_LVAL | VT_SYM)) == VT_CONST) { if ((vtop->r & (VT_VALMASK | VT_LVAL | VT_SYM)) == VT_CONST) {
#endif
n = vtop->c.i; n = vtop->c.i;
last_vtop = vtop; last_vtop = vtop;
if (n < 0) if (n < 0)
error("invalid array size"); error("invalid array size");
#ifdef TOK_alloca
} else { } else {
if (!is_integer_btype(vtop->type.t & VT_BTYPE)) if (!is_integer_btype(vtop->type.t & VT_BTYPE))
error("size of variable length array should be an integer"); error("size of variable length array should be an integer");
type->t |= VT_VLA; type->t |= VT_VLA;
last_vtop = vtop; last_vtop = vtop;
} }
#endif
} }
skip(']'); skip(']');
/* parse next post type */ /* parse next post type */
@ -4868,11 +4864,7 @@ static void decl_initializer(CType *type, Section *sec, unsigned long c,
int a; int a;
CValue retcval; CValue retcval;
/* No need to coment all the block as it will never be called without
TOK_alloca defined (See ifdef TOK_alloca stanza in post_type */
#ifdef TOK_alloca
vpush_global_sym(&func_old_type, TOK_alloca); vpush_global_sym(&func_old_type, TOK_alloca);
#endif
vla_runtime_type_size(type, &a); vla_runtime_type_size(type, &a);
gfunc_call(1); gfunc_call(1);

4
tests/tcctest.c
View file

@ -2010,7 +2010,7 @@ void old_style_function(void)
void alloca_test() void alloca_test()
{ {
#ifdef TOK_alloca #if defined __i386__ || defined __x86_64__
char *p = alloca(16); char *p = alloca(16);
strcpy(p,"123456789012345"); strcpy(p,"123456789012345");
printf("alloca: p is %s\n", p); printf("alloca: p is %s\n", p);
@ -2022,7 +2022,7 @@ void alloca_test()
void c99_vla_test(int size1, int size2) void c99_vla_test(int size1, int size2)
{ {
#ifdef TOK_alloca #if defined __i386__ || defined __x86_64__
int tab1[size1 * size2][2], tab2[10][2]; int tab1[size1 * size2][2], tab2[10][2];
void *tab1_ptr, *tab2_ptr; void *tab1_ptr, *tab2_ptr;