Fix more nocode_wanted jump problems

In statement expression we really mustn't emit backward jumps under nocode_wanted (they will form infinte loops as no expressions are evaluated). Do-while and explicit loop with gotos weren't handled.

Michael Matz committed 10 years ago

Commit 16029981 parent f2a071e3 files · +46 −4Browse files

Unified · Split

3 files

tccgen.c +10 −4
tests/tests2/82_nocode_wanted.c +32 −0
tests/tests2/82_nocode_wanted.expect +4 −0

tccgen.c+10−4

         skip('(');
         gsym(b);
         gexpr();
-        c = gvtst(0, 0);
+	c = gvtst(0, 0);
-        gsym_addr(c, d);
+	if (!nocode_wanted)
+	    gsym_addr(c, d);
         skip(')');
         gsym(a);
         skip(';');
             gexpr();
             if ((vtop->type.t & VT_BTYPE) != VT_PTR)
                 expect("pointer");
-            ggoto();
+	    if (!nocode_wanted)
+                ggoto();
+	    else
+	        vtop--;
         } else if (tok >= TOK_UIDENT) {
             s = label_find(tok);
             /* put forward definition if needed */
                     s->r = LABEL_FORWARD;
             }
             vla_sp_restore_root();
-            if (s->r & LABEL_FORWARD)
+	    if (nocode_wanted)
+	      ;
+	    else if (s->r & LABEL_FORWARD)
                 s->jnext = gjmp(s->jnext);
             else
                 gjmp_addr(s->jnext);

tests/tests2/82_nocode_wanted.c+32−0

@@ -27,6 +27,36 @@ static void kb_wait_2(void) · 26 unmodified lines
27	timeout--;	27	timeout--;
28	} while (timeout);	28	} while (timeout);
29	}	29	}
		30	static void kb_wait_2_1(void)
		31	{
		32	unsigned long timeout = 2;
		33	do {
		34	(1 ?
		35	printf("timeout=%ld\n", timeout) :
		36	({
		37	do {
		38	printf("error\n");
		39	} while (1);
		40	})
		41	);
		42	timeout--;
		43	} while (timeout);
		44	}
		45	static void kb_wait_2_2(void)
		46	{
		47	unsigned long timeout = 2;
		48	do {
		49	(1 ?
		50	printf("timeout=%ld\n", timeout) :
		51	({
		52	label:
		53	printf("error\n");
		54	goto label;
		55	})
		56	);
		57	timeout--;
		58	} while (timeout);
		59	}
30	static void kb_wait_3(void)	60	static void kb_wait_3(void)
31	{	61	{
32	unsigned long timeout = 2;	62	unsigned long timeout = 2;
@@ -73,6 +103,8 @@ int main() · 40 unmodified lines
73	printf("begin\n");	103	printf("begin\n");
74	kb_wait_1();	104	kb_wait_1();
75	kb_wait_2();	105	kb_wait_2();
		106	kb_wait_2_1();
		107	kb_wait_2_2();
76	kb_wait_3();	108	kb_wait_3();
77	kb_wait_4();	109	kb_wait_4();
78	printf("end\n");	110	printf("end\n");

tests/tests2/82_nocode_wanted.expect+4−0

 timeout=1
 timeout=2
 timeout=1
+timeout=2
+timeout=1
+timeout=2
+timeout=1
 end

Fix more nocode_wanted jump problems

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code