backport: re PR target/60193 (ICE on big nested frame)

2014-02-18  Kai Tietz  <ktietz@redhat.com>

	Backport from mainline
	PR target/60193
	* config/i386/i386.c (ix86_expand_prologue): Use
	rax register as displacement for restoring %r10, %rax.
	Additional fix wrong offset for restoring both-registers.

2014-02-18  Kai Tietz  <ktietz@redhat.com>

	PR target/60193
	* gcc.target/i386/nest-1.c: New testcase.

From-SVN: r207845

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 94e1b3f5e9563c3f53d2225dad973f868921733c..1b1f6190c04b22a447ded57da95a398e0019a6bd 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2014-02-18  Kai Tietz  <ktietz@redhat.com>
+
+       Backport from mainline
+       PR target/60193
+       * config/i386/i386.c (ix86_expand_prologue): Use
+       rax register as displacement for restoring %r10, %rax.
+       Additional fix wrong offset for restoring both-registers.
+
 2014-02-18  Eric Botcazou  <ebotcazou@adacore.com>
 
        * ipa-prop.c (compute_complex_ancestor_jump_func): Replace overzealous

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 2750753a2bb624f5156a3f9460a9f3256923a330..effa956e74b4c116deba49c1fdb59898c9b18f0b 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -10529,17 +10529,16 @@ ix86_expand_prologue (void)
         works for realigned stack, too.  */
       if (r10_live && eax_live)
         {
-         t = plus_constant (Pmode, stack_pointer_rtx, allocate);
+         t = gen_rtx_PLUS (Pmode, stack_pointer_rtx, eax);
          emit_move_insn (gen_rtx_REG (word_mode, R10_REG),
                          gen_frame_mem (word_mode, t));
-         t = plus_constant (Pmode, stack_pointer_rtx,
-                            allocate - UNITS_PER_WORD);
+         t = plus_constant (Pmode, t, UNITS_PER_WORD);
          emit_move_insn (gen_rtx_REG (word_mode, AX_REG),
                          gen_frame_mem (word_mode, t));
        }
       else if (eax_live || r10_live)
        {
-         t = plus_constant (Pmode, stack_pointer_rtx, allocate);
+         t = gen_rtx_PLUS (Pmode, stack_pointer_rtx, eax);
          emit_move_insn (gen_rtx_REG (word_mode,
                                       (eax_live ? AX_REG : R10_REG)),
                          gen_frame_mem (word_mode, t));

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0721075bfe5048a9e19fc6149c727f04ae446dfb..e1599b589780964240cc77ba43479d23501e9aa8 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-18  Kai Tietz  <ktietz@redhat.com>
+
+       PR target/60193
+       * gcc.target/i386/nest-1.c: New testcase.
+
 2014-02-18  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gnat.dg/opt32.adb: New test.

diff --git a/gcc/testsuite/gcc.target/i386/nest-1.c b/gcc/testsuite/gcc.target/i386/nest-1.c
new file mode 100644 (file)
index 0000000..ba75350
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/nest-1.c
@@ -0,0 +1,14 @@
+/* { dg-do compile { target llp64 } } */
+/* { dg-options "" } */
+
+void foo (int i)
+{
+  void nested (void)
+  {
+    char arr[(1U << 31) + 4U];
+    arr[i] = 0;
+  }
+
+  nested ();
+}
+