nocode_wanted with while/for inside ({})

a test included.
master
seyko 2016-04-05 11:47:20 +03:00
parent 5a704457e2
commit c9473a7529
3 changed files with 96 additions and 3 deletions

View File

@ -3848,7 +3848,8 @@ ST_FUNC void unary(void)
if (const_wanted)
tcc_error("expected constant");
/* save all registers */
save_regs(0);
if (!nocode_wanted)
save_regs(0);
/* statement expression : we do not accept break/continue
inside as GCC does */
block(NULL, NULL, NULL, NULL, 0, 1);
@ -4878,7 +4879,8 @@ static void block(int *bsym, int *csym, int *case_sym, int *def_sym,
a = gvtst(1, 0);
b = 0;
block(&a, &b, case_sym, def_sym, case_reg, 0);
gjmp_addr(d);
if(!nocode_wanted)
gjmp_addr(d);
gsym(a);
gsym_addr(b, d);
} else if (tok == '{') {
@ -5070,7 +5072,8 @@ static void block(int *bsym, int *csym, int *case_sym, int *def_sym,
}
skip(')');
block(&a, &b, case_sym, def_sym, case_reg, 0);
gjmp_addr(c);
if(!nocode_wanted)
gjmp_addr(c);
gsym(a);
gsym_addr(b, c);
scope_stack_bottom = scope_stack_bottom->next;

View File

@ -0,0 +1,80 @@
extern int printf(const char *format, ...);
static void kb_wait_1(void)
{
unsigned long timeout = 2;
do {
(1 ?
printf("timeout=%ld\n", timeout) :
({
while (1)
printf("error\n");
})
);
timeout--;
} while (timeout);
}
static void kb_wait_2(void)
{
unsigned long timeout = 2;
do {
(1 ?
printf("timeout=%ld\n", timeout) :
({
for (;;)
printf("error\n");
})
);
timeout--;
} while (timeout);
}
static void kb_wait_3(void)
{
unsigned long timeout = 2;
do {
(1 ?
printf("timeout=%ld\n", timeout) :
({
int i = 1;
goto label;
i = i + 2;
label:
i = i + 3;
})
);
timeout--;
} while (timeout);
}
static void kb_wait_4(void)
{
unsigned long timeout = 2;
do {
(1 ?
printf("timeout=%ld\n", timeout) :
({
switch(timeout) {
case 2:
printf("timeout is 2");
break;
case 1:
printf("timeout is 1");
break;
default:
printf("timeout is 0?");
break;
};
// return;
})
);
timeout--;
} while (timeout);
}
int main()
{
printf("begin\n");
kb_wait_1();
kb_wait_2();
kb_wait_3();
kb_wait_4();
printf("end\n");
return 0;
}

View File

@ -0,0 +1,10 @@
begin
timeout=2
timeout=1
timeout=2
timeout=1
timeout=2
timeout=1
timeout=2
timeout=1
end