re PR tree-optimization/33458 (ICE "PHI def is not a GIMPLE value")

	PR tree-optimization/33458
	* tree-inline.c (copy_phis_for_bb): If PHI arg substitution creates
	!is_gimple_val PHI argument, gimplify it and insert it on edge.

	* g++.dg/opt/inline12.C: New test.

From-SVN: r129921

4 files changed, 50 insertions, 0 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 38237bf..0219543 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2007-11-06  Jakub Jelinek  <jakub@redhat.com>
 
+	PR tree-optimization/33458
+	* tree-inline.c (copy_phis_for_bb): If PHI arg substitution creates
+	!is_gimple_val PHI argument, gimplify it and insert it on edge.
+
 	PR tree-optimization/33993
 	* tree-vect-transform.c (vect_get_constant_vectors): Use build_vector
 	rather than build_constructor_from_list if all list values are
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 54974ac..8b04b28 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2007-11-06  Jakub Jelinek  <jakub@redhat.com>
 
+	PR tree-optimization/33458
+	* g++.dg/opt/inline12.C: New test.
+
 	PR tree-optimization/33993
 	* gcc.c-torture/compile/20071105-1.c: New test.
 
diff --git a/gcc/testsuite/g++.dg/opt/inline12.C b/gcc/testsuite/g++.dg/opt/inline12.C
new file mode 100644
index 0000000..d9eae30
--- /dev/null
+++ b/gcc/testsuite/g++.dg/opt/inline12.C
@@ -0,0 +1,32 @@
+// PR tree-optimization/33458
+// { dg-do compile }
+// { dg-options "-O" }
+
+inline void
+foo (int *p, int n)
+{
+  for (; n > 0; --n, ++p)
+    *p = 0;
+}
+
+struct A
+{
+  int x[2];
+  A () { foo (x, 2); }
+};
+
+inline A
+getA ()
+{
+  return A ();
+}
+
+struct B
+{
+  A a;
+  B ();
+};
+
+B::B () : a (getA ())
+{
+}
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index ac8b5b5..e7abeff 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -1193,6 +1193,17 @@ copy_phis_for_bb (basic_block bb, copy_body_data *id)
 
 	      walk_tree (&new_arg, copy_body_r, id, NULL);
 	      gcc_assert (new_arg);
+	      /* With return slot optimization we can end up with
+	         non-gimple (foo *)&this->m, fix that here.  */
+	      if (TREE_CODE (new_arg) != SSA_NAME
+		  && TREE_CODE (new_arg) != FUNCTION_DECL
+		  && !is_gimple_val (new_arg))
+		{
+		  tree stmts = NULL_TREE;
+		  new_arg = force_gimple_operand (new_arg, &stmts,
+						  true, NULL);
+		  bsi_insert_on_edge_immediate (new_edge, stmts);
+		}
 	      add_phi_arg (new_phi, new_arg, new_edge);
 	    }
 	}