diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f509904188acba7ce9c042c02cc1a729f6d455cc..f92ac5aaf6cdf98a1ef545ecc01c89c5eb7bba65 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -26,6 +26,9 @@
 	* c-decl.c (c_init_decl_processing): Remove local variables
 	ptr_ftype_void and ptr_ftype_ptr.
 
+	* gimplify.c (gimplify_expr): Remove local variables r0 and
+	r1.
+
 2005-03-12  Geoffrey Keating  <geoffk@apple.com>
 
 	* c-lex.c (c_lex_with_flags): Add parameter to call to 
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 341ca7baa3f5070adfc937f113443399640311a4..9a6d3076f134a4d014f118de87ac5bd55028971e 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -4041,12 +4041,11 @@ gimplify_expr (tree *expr_p, tree *pre_p, tree *post_p,
 
 	case WITH_SIZE_EXPR:
 	  {
-	    enum gimplify_status r0, r1;
-	    r0 = gimplify_expr (&TREE_OPERAND (*expr_p, 0), pre_p,
-				post_p == &internal_post ? NULL : post_p,
-				gimple_test_f, fallback);
-	    r1 = gimplify_expr (&TREE_OPERAND (*expr_p, 1), pre_p, post_p,
-				is_gimple_val, fb_rvalue);
+	    gimplify_expr (&TREE_OPERAND (*expr_p, 0), pre_p,
+			   post_p == &internal_post ? NULL : post_p,
+			   gimple_test_f, fallback);
+	    gimplify_expr (&TREE_OPERAND (*expr_p, 1), pre_p, post_p,
+			   is_gimple_val, fb_rvalue);
 	  }
 	  break;