diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 752edb86ed1e5323bc31eee9d09271b132627e52..143cefcfa544592dd5eba900fca84bca947cce20 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-14  Richard Guenther  <rguenther@suse.de>
+
+	* gimplify.c (gimplify_expr): Remove odd code.
+
 2012-05-14  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* stor-layout.c (bit_from_pos): Distribute conversion to bitsizetype
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index ca38a0e267599e96885aa048fd44cd75bc6ba119..63195ae8f995e20c53e3a8a8b5bb94a7efc36c86 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -7947,19 +7947,7 @@ gimplify_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p,
 	 TMP.  First, make sure that the expression has a type so that
 	 it can be assigned into a temporary.  */
       gcc_assert (!VOID_TYPE_P (TREE_TYPE (*expr_p)));
-
-      if (!gimple_seq_empty_p (internal_post) || (fallback & fb_lvalue))
-	/* The postqueue might change the value of the expression between
-	   the initialization and use of the temporary, so we can't use a
-	   formal temp.  FIXME do we care?  */
-	{
-	  *expr_p = get_initialized_tmp_var (*expr_p, pre_p, post_p);
-	  if (TREE_CODE (TREE_TYPE (*expr_p)) == COMPLEX_TYPE
-	      || TREE_CODE (TREE_TYPE (*expr_p)) == VECTOR_TYPE)
-	    DECL_GIMPLE_REG_P (*expr_p) = 1;
-	}
-      else
-	*expr_p = get_formal_tmp_var (*expr_p, pre_p);
+      *expr_p = get_formal_tmp_var (*expr_p, pre_p);
     }
   else
     {