aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2014-03-17 20:03:04 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2014-03-17 20:03:04 +0100
commite318c1e15dd56380235bae7b7eea41301ff5e931 (patch)
tree9ee64e45bb75d6778a00b3330dde3226df40128c /gcc
parentf1aa79d85ff9c08d7ccf429bf9633b853d350abe (diff)
downloadgcc-e318c1e15dd56380235bae7b7eea41301ff5e931.zip
gcc-e318c1e15dd56380235bae7b7eea41301ff5e931.tar.gz
gcc-e318c1e15dd56380235bae7b7eea41301ff5e931.tar.bz2
re PR target/60516 (cc1plus crashes compiling a method with a huge struct as argument)
PR target/60516 * config/i386/i386.c (ix86_expand_epilogue): Adjust REG_CFA_ADJUST_CFA note creation for the 2010-08-31 changes. * gcc.target/i386/pr60516.c: New test. From-SVN: r208623
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/config/i386/i386.c5
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.target/i386/pr60516.c20
4 files changed, 34 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b7c5578..1f8e130 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-17 Jakub Jelinek <jakub@redhat.com>
+
+ PR target/60516
+ * config/i386/i386.c (ix86_expand_epilogue): Adjust REG_CFA_ADJUST_CFA
+ note creation for the 2010-08-31 changes.
+
2014-03-17 Marek Polacek <polacek@redhat.com>
PR middle-end/60534
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 64b8e0a..bd7fef0 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -11708,8 +11708,9 @@ ix86_expand_epilogue (int style)
m->fs.cfa_offset -= UNITS_PER_WORD;
m->fs.sp_offset -= UNITS_PER_WORD;
- add_reg_note (insn, REG_CFA_ADJUST_CFA,
- copy_rtx (XVECEXP (PATTERN (insn), 0, 1)));
+ rtx x = plus_constant (Pmode, stack_pointer_rtx, UNITS_PER_WORD);
+ x = gen_rtx_SET (VOIDmode, stack_pointer_rtx, x);
+ add_reg_note (insn, REG_CFA_ADJUST_CFA, x);
add_reg_note (insn, REG_CFA_REGISTER,
gen_rtx_SET (VOIDmode, ecx, pc_rtx));
RTX_FRAME_RELATED_P (insn) = 1;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 51cdaaf..e887fb19 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-17 Jakub Jelinek <jakub@redhat.com>
+
+ PR target/60516
+ * gcc.target/i386/pr60516.c: New test.
+
2014-03-17 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/59571
diff --git a/gcc/testsuite/gcc.target/i386/pr60516.c b/gcc/testsuite/gcc.target/i386/pr60516.c
new file mode 100644
index 0000000..575c8b6
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr60516.c
@@ -0,0 +1,20 @@
+/* PR target/60516 */
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+struct S { char c[65536]; };
+
+__attribute__((ms_abi, thiscall)) void
+foo (void *x, struct S y)
+{
+}
+
+__attribute__((ms_abi, fastcall)) void
+bar (void *x, void *y, struct S z)
+{
+}
+
+__attribute__((ms_abi, stdcall)) void
+baz (struct S x)
+{
+}