From 1602998751c8de219514af271a3925b69a6570fb Mon Sep 17 00:00:00 2001 From: Michael Matz Date: Sun, 4 Sep 2016 05:17:08 +0200 Subject: 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. --- tests/tests2/82_nocode_wanted.c | 32 ++++++++++++++++++++++++++++++++ tests/tests2/82_nocode_wanted.expect | 4 ++++ 2 files changed, 36 insertions(+) (limited to 'tests') diff --git a/tests/tests2/82_nocode_wanted.c b/tests/tests2/82_nocode_wanted.c index 18b4914..a0ec890 100644 --- a/tests/tests2/82_nocode_wanted.c +++ b/tests/tests2/82_nocode_wanted.c @@ -27,6 +27,36 @@ static void kb_wait_2(void) timeout--; } while (timeout); } +static void kb_wait_2_1(void) +{ + unsigned long timeout = 2; + do { + (1 ? + printf("timeout=%ld\n", timeout) : + ({ + do { + printf("error\n"); + } while (1); + }) + ); + timeout--; + } while (timeout); +} +static void kb_wait_2_2(void) +{ + unsigned long timeout = 2; + do { + (1 ? + printf("timeout=%ld\n", timeout) : + ({ + label: + printf("error\n"); + goto label; + }) + ); + timeout--; + } while (timeout); +} static void kb_wait_3(void) { unsigned long timeout = 2; @@ -73,6 +103,8 @@ int main() printf("begin\n"); kb_wait_1(); kb_wait_2(); + kb_wait_2_1(); + kb_wait_2_2(); kb_wait_3(); kb_wait_4(); printf("end\n"); diff --git a/tests/tests2/82_nocode_wanted.expect b/tests/tests2/82_nocode_wanted.expect index 3828ca8..c44d4ea 100644 --- a/tests/tests2/82_nocode_wanted.expect +++ b/tests/tests2/82_nocode_wanted.expect @@ -7,4 +7,8 @@ timeout=2 timeout=1 timeout=2 timeout=1 +timeout=2 +timeout=1 +timeout=2 +timeout=1 end -- cgit v1.3.1