i386.c (release_scratch_register_on_entry): Also adjust sp_offset manually.

	* config/i386/i386.c (release_scratch_register_on_entry): Also adjust
	sp_offset manually.

From-SVN: r193352

gcc/ChangeLog

+2012-11-09  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* config/i386/i386.c (release_scratch_register_on_entry): Also adjust
+	sp_offset manually.
+
 2012-11-08  Christian Bruel  <christian.bruel@st.com>
 
 	* tree-ssa-tail-merge.c (replace_block_by): Update bb2 profile count.
@@ -55,7 +60,6 @@
 	* ipa-prop.c (determine_known_aggregate_parts): Skip writes to
 	different declarations when tracking writes to a declaration.
 
->>>>>>> .r193349
 2012-11-07  David S. Miller  <davem@davemloft.net>
 
 	* config/sparc/constraints.md ("U"): Document, in detail,

gcc/config/i386/i386.c

@@ -9462,6 +9462,7 @@ release_scratch_register_on_entry (struct scratch_reg *sr)
 {
   if (sr->saved)
     {
+      struct machine_function *m = cfun->machine;
       rtx x, insn = emit_insn (gen_pop (sr->reg));
 
       /* The RTX_FRAME_RELATED_P mechanism doesn't know about pop.  */
@@ -9469,6 +9470,7 @@ release_scratch_register_on_entry (struct scratch_reg *sr)
       x = gen_rtx_PLUS (Pmode, stack_pointer_rtx, GEN_INT (UNITS_PER_WORD));
       x = gen_rtx_SET (VOIDmode, stack_pointer_rtx, x);
       add_reg_note (insn, REG_FRAME_RELATED_EXPR, x);
+      m->fs.sp_offset -= UNITS_PER_WORD;
     }
 }
 

gcc/testsuite/ChangeLog

+2012-11-09  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/stack_check3.ad[sb]: New test.
+
 2012-11-08  Ian Lance Taylor  <iant@google.com>
 
 	* go.test/go-test.exp (go-gc-tests): Handle runoutput test type

gcc/testsuite/gnat.dg/stack_check3.adb

+-- { dg-do compile }
+-- { dg-options "-O -fstack-check" }
+
+package body Stack_Check3 is
+
+  type Int_Arr is array (1 .. 34) of Integer;
+
+  type Rec (D : Boolean := False) is
+    record
+      case D is
+        when True  => IA : Int_Arr;
+        when False => null;
+      end case;
+    end record;
+
+  type Rec_Arr is array (1 .. 256) of Rec;
+
+  protected Prot_Arr is
+    procedure Reset;
+  private
+    A : Rec_Arr;
+  end Prot_Arr;
+
+  protected body Prot_Arr is
+    procedure Reset is
+    begin
+      A := (others => (D => False));
+    end Reset;
+  end Prot_Arr;
+
+  procedure Reset is
+  begin
+    Prot_Arr.Reset;
+  end Reset;
+
+end Stack_Check3;

gcc/testsuite/gnat.dg/stack_check3.ads

+package Stack_Check3 is
+
+  procedure Reset;
+
+end Stack_Check3;