diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 01fcd7017154fa83b8ba525326c7aa277898b8c4..8fe56e8db832deb9e31f4a4597e9a1a6ad1d4111 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-04  Jan Hubicka  <jh@suse.cz>
+
+	* cfgexpand.c (expand_one_var): Guard expand_one_stack_var by
+	really_expand.
+
 2006-12-04  Bernd Schmidt  <bernd.schmidt@analog.com>
 
 	* rtlanal.c (note_uses): Deal with SEQUENCEs.
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index b472adb2cd1c20721481647c8c1bc1478df0f254..f3beebe083947877bcc7612a9d89c354f50a0134 100644
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -787,7 +787,8 @@ expand_one_var (tree var, bool toplevel, bool really_expand)
     add_stack_var (var);
   else
     {
-      expand_one_stack_var (var);
+      if (really_expand)
+        expand_one_stack_var (var);
       return tree_low_cst (DECL_SIZE_UNIT (var), 1);
     }
   return 0;