diff options
| author | Dominik Vogt <vogt@linux.vnet.ibm.com> | 2017-04-05 08:28:18 +0000 |
|---|---|---|
| committer | Andreas Krebbel <krebbel@gcc.gnu.org> | 2017-04-05 08:28:18 +0000 |
| commit | d0ee17a526119f45b7f2a593fa54c82dfffe5629 (patch) | |
| tree | 681050570a7afb224418ef45c293b79c3d1c5fc7 | |
| parent | b88a6a88183a6cf44721881fe81a8f5c731bce4f (diff) | |
| download | gcc-d0ee17a526119f45b7f2a593fa54c82dfffe5629.zip gcc-d0ee17a526119f45b7f2a593fa54c82dfffe5629.tar.gz gcc-d0ee17a526119f45b7f2a593fa54c82dfffe5629.tar.bz2 | |
PR target/79890: S/390: Fix crash.
builtin_eh_return requires the return address to be saved on the
stack. The patch prevents using an FPR for that.
gcc/ChangeLog:
2017-04-05 Dominik Vogt <vogt@linux.vnet.ibm.com>
PR target/79890
* config/s390/s390.c (s390_register_info_gprtofpr): Return if
call_eh_return is true.
gcc/testsuite/ChangeLog:
2017-04-05 Dominik Vogt <vogt@linux.vnet.ibm.com>
PR target/79890
* gcc.target/s390/pr79890.c: New test case.
From-SVN: r246701
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/config/s390/s390.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.target/s390/pr79890.c | 11 |
4 files changed, 28 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5e6839c..b29311a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2017-04-05 Dominik Vogt <vogt@linux.vnet.ibm.com> + + PR target/79890 + * config/s390/s390.c (s390_register_info_gprtofpr): Return if + call_eh_return is true. + 2017-04-05 Andreas Krebbel <krebbel@linux.vnet.ibm.com> * config/s390/s390-c.c (s390_resolve_overloaded_builtin): diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c index 51b3d46..2cb8947 100644 --- a/gcc/config/s390/s390.c +++ b/gcc/config/s390/s390.c @@ -9512,6 +9512,12 @@ s390_register_info_gprtofpr () if (!TARGET_Z10 || !TARGET_HARD_FLOAT || !crtl->is_leaf) return; + /* builtin_eh_return needs to be able to modify the return address + on the stack. It could also adjust the FPR save slot instead but + is it worth the trouble?! */ + if (crtl->calls_eh_return) + return; + for (i = 15; i >= 6; i--) { if (cfun_gpr_save_slot (i) == SAVE_SLOT_NONE) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b030d22..98aa5c0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-04-05 Dominik Vogt <vogt@linux.vnet.ibm.com> + + PR target/79890 + * gcc.target/s390/pr79890.c: New test case. + 2017-04-05 Jakub Jelinek <jakub@redhat.com> PR target/80310 diff --git a/gcc/testsuite/gcc.target/s390/pr79890.c b/gcc/testsuite/gcc.target/s390/pr79890.c new file mode 100644 index 0000000..e9894df --- /dev/null +++ b/gcc/testsuite/gcc.target/s390/pr79890.c @@ -0,0 +1,11 @@ +/* { dg-do compile } */ +/* { dg-options "-Wno-pedantic" } */ + +void bar (void); + +void +foo (int x) +{ + __builtin_unwind_init (); + __builtin_eh_return (x, bar); +} |