diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index da92f2f9686a..c597a35900a6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-26  Michael Matz  <matz@suse.de>
+
+	* tree-sra.c (sra_build_assignment): Don't use into_ssa mode,
+	mark new temporaries for renaming.
+
 2009-04-26  Joseph Myers  <joseph@codesourcery.com>
 
 	PR c/39581
diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index f0e4bd02ff5a..ff8a7399459b 100644
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -2206,14 +2206,16 @@ sra_build_assignment (tree dst, tree src)
 	var = fold_build1 (VIEW_CONVERT_EXPR, TREE_TYPE (dst), var);
 
       push_gimplify_context (&gctx);
-      gctx.into_ssa = true;
       gctx.allow_rhs_cond_expr = true;
 
       gimplify_assign (dst, var, &seq);
 
       if (gimple_referenced_vars (cfun))
 	for (var = gctx.temps; var; var = TREE_CHAIN (var))
-	  add_referenced_var (var);
+	  {
+	    add_referenced_var (var);
+	    mark_sym_for_renaming (var);
+	  }
       pop_gimplify_context (NULL);
 
       return seq;