diff options
| author | Richard Biener <rguenther@suse.de> | 2013-01-31 08:52:56 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2013-01-31 08:52:56 +0000 |
| commit | fcfa87ac3dbb62b8cb32a919711e00d17557fe05 (patch) | |
| tree | 2e465695c285d693a3dddd35c07a4279c368fea8 /gcc | |
| parent | b7138297354718412ab7cbd42c801c02b2ada07a (diff) | |
| download | gcc-fcfa87ac3dbb62b8cb32a919711e00d17557fe05.zip gcc-fcfa87ac3dbb62b8cb32a919711e00d17557fe05.tar.gz gcc-fcfa87ac3dbb62b8cb32a919711e00d17557fe05.tar.bz2 | |
re PR tree-optimization/56150 (ICE segfault in do_pre / tail_merge_optimize)
2013-01-31 Richard Biener <rguenther@suse.de>
PR tree-optimization/56150
* tree-ssa-tail-merge.c (gimple_equal_p): Properly handle
mixed store non-store stmts.
* gcc.dg/torture/pr56150.c: New testcase.
From-SVN: r195608
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/torture/pr56150.c | 17 | ||||
| -rw-r--r-- | gcc/tree-ssa-tail-merge.c | 19 |
4 files changed, 36 insertions, 11 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c93f31d..ae641ef 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2013-01-30 Richard Biener <rguenther@suse.de> + + PR tree-optimization/56150 + * tree-ssa-tail-merge.c (gimple_equal_p): Properly handle + mixed store non-store stmts. + 2013-01-30 Jakub Jelinek <jakub@redhat.com> PR sanitizer/55374 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index edd3d14..2632cd0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-01-30 Richard Biener <rguenther@suse.de> + + PR tree-optimization/56150 + * gcc.dg/torture/pr56150.c: New testcase. + 2013-01-30 Jakub Jelinek <jakub@redhat.com> PR sanitizer/55374 diff --git a/gcc/testsuite/gcc.dg/torture/pr56150.c b/gcc/testsuite/gcc.dg/torture/pr56150.c new file mode 100644 index 0000000..6de1115 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr56150.c @@ -0,0 +1,17 @@ +/* { dg-do compile } */ + +struct { + int f4; +} g1; + +long g2; + +volatile long g3; + +void func_1 () +{ + if (g2) + g1 = g1; + else + g3; +} diff --git a/gcc/tree-ssa-tail-merge.c b/gcc/tree-ssa-tail-merge.c index 367a266..b20d306 100644 --- a/gcc/tree-ssa-tail-merge.c +++ b/gcc/tree-ssa-tail-merge.c @@ -1119,17 +1119,14 @@ gimple_equal_p (same_succ same_succ, gimple s1, gimple s2) case GIMPLE_ASSIGN: lhs1 = gimple_get_lhs (s1); lhs2 = gimple_get_lhs (s2); - if (gimple_vdef (s1)) - { - if (vn_valueize (gimple_vdef (s1)) != vn_valueize (gimple_vdef (s2))) - return false; - if (TREE_CODE (lhs1) != SSA_NAME - && TREE_CODE (lhs2) != SSA_NAME) - return true; - } - return (TREE_CODE (lhs1) == SSA_NAME - && TREE_CODE (lhs2) == SSA_NAME - && vn_valueize (lhs1) == vn_valueize (lhs2)); + if (TREE_CODE (lhs1) != SSA_NAME + && TREE_CODE (lhs2) != SSA_NAME) + return (vn_valueize (gimple_vdef (s1)) + == vn_valueize (gimple_vdef (s2))); + else if (TREE_CODE (lhs1) == SSA_NAME + && TREE_CODE (lhs2) == SSA_NAME) + return vn_valueize (lhs1) == vn_valueize (lhs2); + return false; case GIMPLE_COND: t1 = gimple_cond_lhs (s1); |