From: rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 12 Dec 2014 13:26:15 +0000 (+0000)
Subject: 2014-12-12  Richard Biener  <rguenther@suse.de>
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=854b08c04a013198eeab0d52e5db88941f0b43e6;p=thirdparty%2Fgcc.git

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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@218668 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 85eceaf56598..95f885bc435c 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 e4eb34b57025..5b485a97708b 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 000000000000..6ea31481bd57
--- /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 6aca58d27d69..0ae4bd76f408 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))