re PR middle-end/45565 (ICE: in execute_todo, at passes.c:1276 with…

re PR middle-end/45565 (ICE: in execute_todo, at passes.c:1276 with -fno-toplevel-reorder -fno-inline -fipa-cp-clone -fkeep-inline-functions)

2010-09-23  Richard Guenther  <rguenther@suse.de>

	PR tree-optimization/45565
	* cgraphunit.c (cgraph_redirect_edge_call_stmt_to_callee):
	Make sure to adjust the fndecl before replacing the stmt.

	* g++.dg/ipa/pr45565.C: New testcase.

From-SVN: r164561

gcc/ChangeLog

 2010-09-23  Richard Guenther  <rguenther@suse.de>
 
+	PR tree-optimization/45565
+	* cgraphunit.c (cgraph_redirect_edge_call_stmt_to_callee):
+	Make sure to adjust the fndecl before replacing the stmt.
+
+2010-09-23  Richard Guenther  <rguenther@suse.de>
+
 	PR middle-end/45750
 	* gimplify.c (gimplify_expr): Properly pass on GS_ERROR when
 	gimplifying MEM_REF.

gcc/cgraphunit.c

@@ -2159,6 +2159,7 @@ cgraph_redirect_edge_call_stmt_to_callee (struct cgraph_edge *e)
       new_stmt
 	= gimple_call_copy_skip_args (e->call_stmt,
 				      e->callee->clone.combined_args_to_skip);
+      gimple_call_set_fndecl (new_stmt, e->callee->decl);
 
       if (gimple_vdef (new_stmt)
 	  && TREE_CODE (gimple_vdef (new_stmt)) == SSA_NAME)
@@ -2168,10 +2169,11 @@ cgraph_redirect_edge_call_stmt_to_callee (struct cgraph_edge *e)
       gsi_replace (&gsi, new_stmt, true);
     }
   else
-    new_stmt = e->call_stmt;
-
-  gimple_call_set_fndecl (new_stmt, e->callee->decl);
-  update_stmt (new_stmt);
+    {
+      new_stmt = e->call_stmt;
+      gimple_call_set_fndecl (new_stmt, e->callee->decl);
+      update_stmt (new_stmt);
+    }
 
   cgraph_set_call_stmt_including_clones (e->caller, e->call_stmt, new_stmt);
 

gcc/testsuite/ChangeLog

+2010-09-23  Richard Guenther  <rguenther@suse.de>
+
+	PR tree-optimization/45565
+	* g++.dg/ipa/pr45565.C: New testcase.
+
 2010-09-23  Mikael Morin  <mikael@gcc.gnu.org>
 
 	PR fortran/45745

gcc/testsuite/g++.dg/ipa/pr45565.C

+// { dg-do compile }
+// { dg-options "-O -fno-toplevel-reorder -fno-inline -fipa-cp -fipa-cp-clone -fkeep-inline-functions" }
+
+template < typename Derived > struct AnyMatrixBase
+{
+};
+
+struct Matrix Random ();
+
+struct Matrix:AnyMatrixBase < Matrix >
+{
+  void bar ()
+    {
+      throw;
+    }
+  void foo (Matrix other)
+    {
+      bar ();
+      Matrix (AnyMatrixBase < Matrix > (Random ()));
+    }
+  template
+      < typename OtherDerived > Matrix (AnyMatrixBase < OtherDerived > other)
+	{
+	  foo (other);
+	}
+};
+
+Matrix x (Random ());
+