From 232b8f528b7e67aecb7682a3c375be641f74ba48 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 25 Feb 2002 23:49:44 +0100 Subject: [PATCH] re PR target/5755 (-mregparm=3 and -fomit-frame-pointer corrupt esp register) PR target/5755 * config/i386/i386.c (ix86_return_pops_args): Only pop fake structure return argument if it was passed on the stack. * gcc.dg/20020224-1.c: New test. From-SVN: r50028 --- gcc/ChangeLog | 6 +++++ gcc/config/i386/i386.c | 19 +++++++++++--- gcc/testsuite/ChangeLog | 4 +++ gcc/testsuite/gcc.dg/20020224-1.c | 41 +++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/20020224-1.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f2faf55a6529..8925413080d5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2002-02-25 Jakub Jelinek + + PR target/5755 + * config/i386/i386.c (ix86_return_pops_args): Only pop + fake structure return argument if it was passed on the stack. + 2002-02-25 Jason Merrill * attribs.c (decl_attributes): Also re-layout PARM_DECL and diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 009b5d8511bc..fc78c57ec5cf 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -1466,12 +1466,25 @@ ix86_return_pops_args (fundecl, funtype, size) return size; } - /* Lose any fake structure return argument. */ + /* Lose any fake structure return argument if it is passed on the stack. */ if (aggregate_value_p (TREE_TYPE (funtype)) && !TARGET_64BIT) - return GET_MODE_SIZE (Pmode); + { + int nregs = ix86_regparm; - return 0; + if (funtype) + { + tree attr = lookup_attribute ("regparm", TYPE_ATTRIBUTES (funtype)); + + if (attr) + nregs = TREE_INT_CST_LOW (TREE_VALUE (TREE_VALUE (attr))); + } + + if (!nregs) + return GET_MODE_SIZE (Pmode); + } + + return 0; } /* Argument support functions. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8d445c87f258..393aec7b9c76 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2002-02-25 Jakub Jelinek + + * gcc.dg/20020224-1.c: New test. + 2002-02-25 Alan Modra * gcc.c-torture/execute/20020225-1.c: New. diff --git a/gcc/testsuite/gcc.dg/20020224-1.c b/gcc/testsuite/gcc.dg/20020224-1.c new file mode 100644 index 000000000000..a286b6b0599e --- /dev/null +++ b/gcc/testsuite/gcc.dg/20020224-1.c @@ -0,0 +1,41 @@ +/* PR target/5755 + This testcase failed because the caller of a function returning struct + expected the callee to pop up the hidden return structure pointer, + while callee was actually not poping it up (as the hidden argument + was passed in register). */ +/* { dg-do run { target i?86-*-* } } */ +/* { dg-options "-O2 -fomit-frame-pointer" } */ + +extern void abort (void); +extern void exit (int); + +typedef struct { + int a1, a2; +} A; + +A a; + +A __attribute__ ((regparm (2))) +foo (int x) +{ + return a; +} + +int __attribute__ ((regparm (2))) +bar (int x) +{ + int r = foo(0).a2; + return r; +} + +int +main () +{ + int f; + a.a1 = 530; + a.a2 = 980; + f = bar (0); + if (f != 980) + abort (); + exit (0); +} -- 2.43.5