diff options
| author | Richard Biener <rguenther@suse.de> | 2014-12-12 13:26:15 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2014-12-12 13:26:15 +0000 |
| commit | 8c7b90945f6b13adea05b75d01f17225fb135bac (patch) | |
| tree | 9e1237f09956ec5e3882ea9d64d66cd5e445292c | |
| parent | e03f0c47a69f449893dfa352563dda884d1d1060 (diff) | |
| download | gcc-8c7b90945f6b13adea05b75d01f17225fb135bac.zip gcc-8c7b90945f6b13adea05b75d01f17225fb135bac.tar.gz gcc-8c7b90945f6b13adea05b75d01f17225fb135bac.tar.bz2 | |
re PR tree-optimization/64280 (ICE in replace_uses_by, at tree-cfg.c:1789)
2014-12-12 Richard Biener <rguenther@suse.de>
PR middle-end/64280
* tree-cfg.c (replace_uses_by): Guard assert properly.
* g++.dg/torture/pr64280.C: New testcase.
From-SVN: r218668
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/torture/pr64280.C | 42 | ||||
| -rw-r--r-- | gcc/tree-cfg.c | 3 |
4 files changed, 54 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 85eceaf..95f885b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2014-12-12 Richard Biener <rguenther@suse.de> + + PR middle-end/64280 + * tree-cfg.c (replace_uses_by): Guard assert properly. + 2014-12-12 Anthony Green <green@moxielogic.com> * config/moxie/moxie.md: Add use of zex instruction. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e4eb34b..5b485a9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-12-12 Richard Biener <rguenther@suse.de> + + PR middle-end/64280 + * g++.dg/torture/pr64280.C: New testcase. + 2014-12-12 Jakub Jelinek <jakub@redhat.com> PR rtl-optimization/64255 diff --git a/gcc/testsuite/g++.dg/torture/pr64280.C b/gcc/testsuite/g++.dg/torture/pr64280.C new file mode 100644 index 0000000..6ea3148 --- /dev/null +++ b/gcc/testsuite/g++.dg/torture/pr64280.C @@ -0,0 +1,42 @@ +// { dg-do compile } + +class A +{ +public: + A (); +}; +class B +{ +public: + B (int); + operator void *() { return m_fn1 () ? 0 : this; } + int m_fn1 (); +}; +typedef int jmp_buf[]; +struct C +{ + jmp_buf cond_; +}; +class F +{ + C what_; + bool m_fn2 (); +}; +int _setjmp (int[]); +void longjmp (); +class D +{ +public: + D () { longjmp (); } +}; +bool +F::m_fn2 () +{ + B a (0); + if (a) + if (_setjmp (what_.cond_)) + return 0; + else + D (); + A b; +} diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index 6aca58d..0ae4bd7 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -1781,7 +1781,8 @@ replace_uses_by (tree name, tree val) { e = gimple_phi_arg_edge (as_a <gphi *> (stmt), PHI_ARG_INDEX_FROM_USE (use)); - if (e->flags & EDGE_ABNORMAL) + if (e->flags & EDGE_ABNORMAL + && !SSA_NAME_OCCURS_IN_ABNORMAL_PHI (val)) { /* This can only occur for virtual operands, since for the real ones SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name)) |