diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 73750417c4e..3e9707c2fd9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-13  Richard Guenther  <rguenther@suse.de>
+
+	PR middle-end/30141
+	* tree-nested.c (finalize_nesting_tree_1): Generate valid
+	gimple stores for memory rhs.
+
 2008-09-13  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR rtl-optimization/37489
diff --git a/gcc/tree-nested.c b/gcc/tree-nested.c
index cfa1dd4b1ee..8f9fec58cf6 100644
--- a/gcc/tree-nested.c
+++ b/gcc/tree-nested.c
@@ -1995,6 +1995,15 @@ finalize_nesting_tree_1 (struct nesting_info *root)
 		      root->frame_decl, field, NULL_TREE);
 	  stmt = gimple_build_assign (y, x);
 	  gimple_seq_add_stmt (&stmt_list, stmt);
+	  /* If the assignment is from a non-register the stmt is
+	     not valid gimple.  Make it so by using a temporary instead.  */
+	  if (!is_gimple_reg (x)
+	      && is_gimple_reg_type (TREE_TYPE (x)))
+	    {
+	      gimple_stmt_iterator gsi = gsi_last (stmt_list);
+	      x = init_tmp_var (root, x, &gsi);
+	      gimple_assign_set_rhs1 (stmt, x);
+	    }
 	}
     }