re PR middle-end/34018 (ICE: verify_stmts failed)

	PR middle-end/34018
	* tree-inline.h (copy_body_data): Add regimplify field.
	* tree-inline.c (copy_body_r): Set id->regimplify to true
	if an TREE_INVARIANT ADDR_EXPR is no longer invariant after
	substitutions.
	(copy_bb): Clear id->regimplify before walk_tree, if it is
	set afterwards, regimplify the whole statement.

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

From-SVN: r130068

gcc/ChangeLog

 2007-11-10  Jakub Jelinek  <jakub@redhat.com>
 
+	PR middle-end/34018
+	* tree-inline.h (copy_body_data): Add regimplify field.
+	* tree-inline.c (copy_body_r): Set id->regimplify to true
+	if an TREE_INVARIANT ADDR_EXPR is no longer invariant after
+	substitutions.
+	(copy_bb): Clear id->regimplify before walk_tree, if it is
+	set afterwards, regimplify the whole statement.
+
 	PR tree-optimization/33680
 	* tree-data-ref.c (split_constant_offset) <case ADDR_EXPR>: Punt
 	if the added cast involves variable length types.

gcc/testsuite/g++.dg/opt/inline14.C

+// PR middle-end/34018
+// { dg-do compile }
+// { dg-options "-O1" }
+
+template <typename E, unsigned long N>
+struct A
+{
+  typedef E F;
+  E elems[N];
+  A () {}
+  E *begin () { return elems; }
+  const E *begin () const { return elems; }
+
+  explicit A (F const &v0, F const &v1, F const &v2)
+  {
+    elems[0] = v0;
+    elems[1] = v1;
+    elems[2] = v2;
+  }
+};
+
+template <typename E1, typename E2, typename E3>
+inline void
+bar (const E1 *a1, E2 const &a2, E3 *a3, unsigned long const &sz)
+{
+  E3 *r = a3 + sz;
+  for (;a3 != r; a1++, a3++)
+    *a3 = *a1 - a2;
+}
+
+template<typename E, unsigned long N>
+inline A<E, N>
+operator- (A<E, N> const& a1, E const& a2)
+{
+  typedef A<E, N> G;
+  G a3;
+  bar (a1.begin (), a2, a3.begin (), N);
+  return a3;
+}
+
+struct B
+{
+  B (A<unsigned long, 3> const &m) : n (m - static_cast<unsigned long>(1)) {}
+  A<unsigned long, 3> n;
+};
+
+void
+foo ()
+{
+  B t (A<unsigned long, 3> (0,0,0));
+}

gcc/tree-inline.c

@@ -748,6 +748,7 @@ copy_body_r (tree *tp, int *walk_subtrees, void *data)
 	 and friends are up-to-date.  */
       else if (TREE_CODE (*tp) == ADDR_EXPR)
 	{
+	  int invariant = TREE_INVARIANT (*tp);
 	  walk_tree (&TREE_OPERAND (*tp, 0), copy_body_r, id, NULL);
 	  /* Handle the case where we substituted an INDIRECT_REF
 	     into the operand of the ADDR_EXPR.  */
@@ -755,6 +756,10 @@ copy_body_r (tree *tp, int *walk_subtrees, void *data)
 	    *tp = TREE_OPERAND (TREE_OPERAND (*tp, 0), 0);
 	  else
 	    recompute_tree_invariant_for_addr_expr (*tp);
+	  /* If this used to be invariant, but is not any longer,
+	     then regimplification is probably needed.  */
+	  if (invariant && !TREE_INVARIANT (*tp))
+	    id->regimplify = true;
 	  *walk_subtrees = 0;
 	}
     }
@@ -792,6 +797,7 @@ copy_bb (copy_body_data *id, basic_block bb, int frequency_scale, int count_scal
       tree stmt = bsi_stmt (bsi);
       tree orig_stmt = stmt;
 
+      id->regimplify = false;
       walk_tree (&stmt, copy_body_r, id, NULL);
 
       /* RETURN_EXPR might be removed,
@@ -804,9 +810,10 @@ copy_bb (copy_body_data *id, basic_block bb, int frequency_scale, int count_scal
 
 	  /* With return slot optimization we can end up with
 	     non-gimple (foo *)&this->m, fix that here.  */
-	  if (TREE_CODE (stmt) == GIMPLE_MODIFY_STMT
-	      && TREE_CODE (GIMPLE_STMT_OPERAND (stmt, 1)) == NOP_EXPR
-	      && !is_gimple_val (TREE_OPERAND (GIMPLE_STMT_OPERAND (stmt, 1), 0)))
+	  if ((TREE_CODE (stmt) == GIMPLE_MODIFY_STMT
+	       && TREE_CODE (GIMPLE_STMT_OPERAND (stmt, 1)) == NOP_EXPR
+	       && !is_gimple_val (TREE_OPERAND (GIMPLE_STMT_OPERAND (stmt, 1), 0)))
+	      || id->regimplify)
 	    gimplify_stmt (&stmt);
 
           bsi_insert_after (&copy_bsi, stmt, BSI_NEW_STMT);

gcc/tree-inline.h

@@ -92,6 +92,9 @@ typedef struct copy_body_data
      duplicating BLOCK nodes.  */
   bool transform_lang_insert_block;
 
+  /* True if this statement will need to be regimplified.  */
+  bool regimplify;
+
   /* Statements that might be possibly folded.  */
   struct pointer_set_t *statements_to_fold;
 } copy_body_data;