diff options
| author | Richard Biener <rguenther@suse.de> | 2019-01-15 15:37:29 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2019-01-15 15:37:29 +0000 |
| commit | 41bc37bad8cb29027155f247e6ad4be83d64f163 (patch) | |
| tree | 7af239e52f83931e3758bbb6954a1653a729570e /gcc | |
| parent | 10ddff67d3ebe819614f1e885567cbb96cad31ae (diff) | |
| download | gcc-41bc37bad8cb29027155f247e6ad4be83d64f163.zip gcc-41bc37bad8cb29027155f247e6ad4be83d64f163.tar.gz gcc-41bc37bad8cb29027155f247e6ad4be83d64f163.tar.bz2 | |
re PR tree-optimization/88855 (ICE: verify_ssa failed (error: SSA_NAME_OCCURS_IN_ABNORMAL_PHI should be set))
2019-01-15 Richard Biener <rguenther@suse.de>
PR tree-optimization/88855
* tree-if-conv.c (combine_blocks): Collect
SSA_NAME_OCCURS_IN_ABNORMAL_PHI from propagated out virtuals.
* gcc.dg/pr88855.c: New testcase.
From-SVN: r267939
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr88855.c | 21 | ||||
| -rw-r--r-- | gcc/tree-if-conv.c | 4 |
4 files changed, 36 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e451509..14f0730 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2019-01-15 Richard Biener <rguenther@suse.de> + + PR tree-optimization/88855 + * tree-if-conv.c (combine_blocks): Collect + SSA_NAME_OCCURS_IN_ABNORMAL_PHI from propagated out virtuals. + 2019-01-15 Tom de Vries <tdevries@suse.de> PR target/80547 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 999810a..a5cfa7f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-01-15 Richard Biener <rguenther@suse.de> + + PR tree-optimization/88855 + * gcc.dg/pr88855.c: New testcase. + 2019-01-15 Paolo Carlini <paolo.carlini@oracle.com> * g++.dg/diagnostic/typedef-initialized.C: New. diff --git a/gcc/testsuite/gcc.dg/pr88855.c b/gcc/testsuite/gcc.dg/pr88855.c new file mode 100644 index 0000000..be6ffe3 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr88855.c @@ -0,0 +1,21 @@ +/* { dg-do compile } */ +/* { dg-options "-O -ftree-loop-if-convert -ftree-vrp -fno-tree-copy-prop -fno-tree-dce -fno-tree-dominator-opts" } */ + +typedef int jmp_buf[1]; + +extern void exit(int) __attribute__((__noreturn__)); +extern int setjmpx(jmp_buf) __attribute__((__returns_twice__)); + +jmp_buf jbAnagram; +int a[6]; +int d; +int b () { exit (1); } +int c () { b (); } +int e () +{ + int f = 0; + for (; f < 6; f++) + a[f] = d; + c (); + setjmpx (jbAnagram); +} diff --git a/gcc/tree-if-conv.c b/gcc/tree-if-conv.c index 76a5bc4..bdd4c2a 100644 --- a/gcc/tree-if-conv.c +++ b/gcc/tree-if-conv.c @@ -2633,6 +2633,8 @@ combine_blocks (struct loop *loop) FOR_EACH_IMM_USE_ON_STMT (use_p, iter) SET_USE (use_p, last_vdef); } + if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (gimple_phi_result (vphi))) + SSA_NAME_OCCURS_IN_ABNORMAL_PHI (last_vdef) = 1; gsi = gsi_for_stmt (vphi); remove_phi_node (&gsi, true); } @@ -2691,6 +2693,8 @@ combine_blocks (struct loop *loop) FOR_EACH_IMM_USE_ON_STMT (use_p, iter) SET_USE (use_p, last_vdef); } + if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (gimple_phi_result (vphi))) + SSA_NAME_OCCURS_IN_ABNORMAL_PHI (last_vdef) = 1; gimple_stmt_iterator gsi = gsi_for_stmt (vphi); remove_phi_node (&gsi, true); } |