re PR middle-end/64465 (internal compiler error: verify_flow_info failed)

	PR tree-optimization/64465
	* tree-inline.c (redirect_all_calls): During inlining
	clean up EH stmts and EH edges if redirect_call_stmt_to_callee
	changed the stmt to a non-throwing call.

	* gcc.dg/pr64465.c: New test.

From-SVN: r219200

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cdf7108..0557edd 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-05  Jakub Jelinek  <jakub@redhat.com>
+
+       PR tree-optimization/64465
+       * tree-inline.c (redirect_all_calls): During inlining
+       clean up EH stmts and EH edges if redirect_call_stmt_to_callee
+       changed the stmt to a non-throwing call.
+
 2015-01-05  Sandra Loosemore  <sandra@codesourcery.com>
 
        * doc/invoke.texi: Fix incorrect uses of @code, @option, @samp,

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 90c25a5..cda4231 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2015-01-05  Jakub Jelinek  <jakub@redhat.com>
 
+       PR tree-optimization/64465
+       * gcc.dg/pr64465.c: New test.
+
        PR tree-optimization/64494
        * gcc.c-torture/compile/pr64494.c: New test.
 

diff --git a/gcc/testsuite/gcc.dg/pr64465.c b/gcc/testsuite/gcc.dg/pr64465.c
new file mode 100644 (file)
index 0000000..acfa952
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr64465.c
@@ -0,0 +1,22 @@
+/* PR tree-optimization/64465 */
+/* { dg-do compile } */
+/* { dg-options "-O2 -fexceptions" } */
+
+extern int foo (int *);
+extern int bar (int, int);
+static inline __attribute__ ((__always_inline__))
+int baz (int o)
+{
+  if (__builtin_constant_p (o))
+    return bar (o, 1);
+  return bar (o, 0);
+}
+
+void
+test (void)
+{
+  int s;
+  foo (&s);
+  baz (4);
+  baz (s);
+}

diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index e573def..902eb95 100644 (file)
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -2582,13 +2582,19 @@ void
 redirect_all_calls (copy_body_data * id, basic_block bb)
 {
   gimple_stmt_iterator si;
+  gimple last = last_stmt (bb);
   for (si = gsi_start_bb (bb); !gsi_end_p (si); gsi_next (&si))
     {
-      if (is_gimple_call (gsi_stmt (si)))
+      gimple stmt = gsi_stmt (si);
+      if (is_gimple_call (stmt))
        {
-         struct cgraph_edge *edge = id->dst_node->get_edge (gsi_stmt (si));
+         struct cgraph_edge *edge = id->dst_node->get_edge (stmt);
          if (edge)
-           edge->redirect_call_stmt_to_callee ();
+           {
+             edge->redirect_call_stmt_to_callee ();
+             if (stmt == last && id->call_stmt && maybe_clean_eh_stmt (stmt))
+               gimple_purge_dead_eh_edges (bb);
+           }
        }
     }
 }