From b1193f619b20b32bbe44e31cae9e590af0cb7324 Mon Sep 17 00:00:00 2001
From: Steven Bosscher <steven@gcc.gnu.org>
Date: Tue, 21 Dec 2010 15:02:02 +0000
Subject: [PATCH] re PR middle-end/45310 (ICE: verify_stmts failed: Dead STMT
 in EH table with -O1 -fnon-call-exceptions)

gcc/
	PR middle-end/45310
	* tree-ssa-phiprop.c (propagate_with_phi): Remove statement
	completely from the function, including EH traces.

testsuite/
	PR middle-end/45310
	* g++.dg/pr45310.C: New test.

From-SVN: r168120
---
 gcc/testsuite/g++.dg/pr45310.C | 31 +++++++++++++++++++++++++++++++
 gcc/tree-ssa-phiprop.c         |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/pr45310.C

diff --git a/gcc/testsuite/g++.dg/pr45310.C b/gcc/testsuite/g++.dg/pr45310.C
new file mode 100644
index 000000000000..335c782570f4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/pr45310.C
@@ -0,0 +1,31 @@
+/* { dg-do compile } */
+/* { dg-options "-O1 -fnon-call-exceptions" }  */
+
+static inline const int &
+max (const int &a, const int &b)
+{
+  return a ? a : b;
+}
+
+static inline int
+baz ()
+{
+  return max (0, 0);
+}
+
+struct S
+{
+  ~S ()
+  {
+    baz ();
+  }
+};
+
+void bar ();
+void
+foo ()
+{
+  S s;
+  bar ();
+}
+
diff --git a/gcc/tree-ssa-phiprop.c b/gcc/tree-ssa-phiprop.c
index 614546bed120..a38e6962f951 100644
--- a/gcc/tree-ssa-phiprop.c
+++ b/gcc/tree-ssa-phiprop.c
@@ -352,7 +352,7 @@ propagate_with_phi (basic_block bb, gimple phi, struct phiprop_d *phivn,
 	     want to delete it here we also have to delete all intermediate
 	     copies.  */
 	  gsi = gsi_for_stmt (use_stmt);
-	  gsi_remove (&gsi, false);
+	  gsi_remove (&gsi, true);
 
 	  phi_inserted = true;
 	}
-- 
2.47.2