diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1a5c210f4df..1fa4ade707c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-13  Jakub Jelinek  <jakub@redhat.com>
+
+	PR rtl-optimization/32636
+	* df-scan.c (df_get_entry_block_def_set): Set struct_value_rtx
+	regno in entry_block_defs even if HAVE_prologue && epilogue_completed.
+
 2007-12-13  Uros Bizjak  <ubizjak@gmail.com>
 	    Richard Guenther  <rguenther@suse.de>
 
diff --git a/gcc/df-scan.c b/gcc/df-scan.c
index cc6866b6b78..6367accec2a 100644
--- a/gcc/df-scan.c
+++ b/gcc/df-scan.c
@@ -3530,12 +3530,12 @@ df_get_entry_block_def_set (bitmap entry_block_defs)
       bitmap_set_bit (entry_block_defs, STATIC_CHAIN_REGNUM);
 #endif
 #endif
-      
-      r = targetm.calls.struct_value_rtx (current_function_decl, true);
-      if (r && REG_P (r))
-	bitmap_set_bit (entry_block_defs, REGNO (r));
     }
 
+  r = targetm.calls.struct_value_rtx (current_function_decl, true);
+  if (r && REG_P (r))
+    bitmap_set_bit (entry_block_defs, REGNO (r));
+
   if ((!reload_completed) || frame_pointer_needed)
     {
       /* Any reference to any pseudo before reload is a potential