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
This commit is contained in:
Richard Biener 2014-12-12 13:26:15 +00:00 committed by Richard Biener
parent e03f0c47a6
commit 8c7b90945f
4 changed files with 54 additions and 1 deletions

View File

@ -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.

View File

@ -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

View File

@ -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;
}

View File

@ -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))