diff options
| author | Martin Liska <mliska@suse.cz> | 2016-11-16 12:56:58 +0100 |
|---|---|---|
| committer | Martin Liska <marxin@gcc.gnu.org> | 2016-11-16 11:56:58 +0000 |
| commit | 080140bc85bd8b5be9634beb8cbc2f0324e1d649 (patch) | |
| tree | b4578276aa988216a737becffed8c4f02ae81ddd | |
| parent | 3e077364f3f6aa74bc662d5c2f16264dd622a4a9 (diff) | |
| download | gcc-080140bc85bd8b5be9634beb8cbc2f0324e1d649.zip gcc-080140bc85bd8b5be9634beb8cbc2f0324e1d649.tar.gz gcc-080140bc85bd8b5be9634beb8cbc2f0324e1d649.tar.bz2 | |
Fix PR sanitizer/78270 (part 2)
PR sanitizer/78270
* gimplify.c (gimplify_switch_expr): Always save previous
gimplify_ctxp->live_switch_vars.
PR sanitizer/78270
* gcc.dg/asan/pr78270.c: Update comment style.
* gcc.dg/asan/pr78270-2.c: New test.
From-SVN: r242485
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/gimplify.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/asan/pr78270-2.c | 18 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/asan/pr78270.c | 5 |
5 files changed, 37 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 40922a0..08f0a7c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2016-11-16 Martin Liska <mliska@suse.cz> + + PR sanitizer/78270 + * gimplify.c (gimplify_switch_expr): Always save previous + gimplify_ctxp->live_switch_vars. + 2016-11-16 Andrew Burgess <andrew.burgess@embecosm.com> * config/arc/arc.md (movb peephole2): New peephole2 to merge two diff --git a/gcc/gimplify.c b/gcc/gimplify.c index 16573dd..c23888b 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -2255,11 +2255,11 @@ gimplify_switch_expr (tree *expr_p, gimple_seq *pre_p) gimplify_ctxp->case_labels.create (8); /* Do not create live_switch_vars if SWITCH_BODY is not a BIND_EXPR. */ + saved_live_switch_vars = gimplify_ctxp->live_switch_vars; if (TREE_CODE (SWITCH_BODY (switch_expr)) == BIND_EXPR) - { - saved_live_switch_vars = gimplify_ctxp->live_switch_vars; - gimplify_ctxp->live_switch_vars = new hash_set<tree> (4); - } + gimplify_ctxp->live_switch_vars = new hash_set<tree> (4); + else + gimplify_ctxp->live_switch_vars = NULL; bool old_in_switch_expr = gimplify_ctxp->in_switch_expr; gimplify_ctxp->in_switch_expr = true; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 00f1166..b964464 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2016-11-16 Martin Liska <mliska@suse.cz> + + PR sanitizer/78270 + * gcc.dg/asan/pr78270.c: Update comment style. + * gcc.dg/asan/pr78270-2.c: New test. + 2016-11-16 Senthil Kumar Selvaraj <senthil_kumar.selvaraj@atmel.com> * c-c++-common/Wlogical-op-1.c: Use __INT{16,32}_TYPE__ instead diff --git a/gcc/testsuite/gcc.dg/asan/pr78270-2.c b/gcc/testsuite/gcc.dg/asan/pr78270-2.c new file mode 100644 index 0000000..72195b3 --- /dev/null +++ b/gcc/testsuite/gcc.dg/asan/pr78270-2.c @@ -0,0 +1,18 @@ +/* PR sanitizer/78270 */ +/* { dg-do compile } */ +/* { dg-additional-options "-Wno-switch-unreachable" } */ + +int a; +void +fn1 () +{ + switch (a) + { + char b; + case 8: + &b; + switch (0) + ; + } +} + diff --git a/gcc/testsuite/gcc.dg/asan/pr78270.c b/gcc/testsuite/gcc.dg/asan/pr78270.c index 55840b0..5583ce4 100644 --- a/gcc/testsuite/gcc.dg/asan/pr78270.c +++ b/gcc/testsuite/gcc.dg/asan/pr78270.c @@ -1,5 +1,6 @@ -// { dg-do compile } -// { dg-additional-options "-Wno-switch-unreachable" } +/* PR sanitizer/78270 */ +/* { dg-do compile } */ +/* { dg-additional-options "-Wno-switch-unreachable" } */ typedef struct { |