From 10e3ee083f12c33aebefa9d07de255bf7bbb77ed Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 21 Aug 2018 16:27:22 +0000 Subject: [PATCH] x86: Always update EH return address in word_mode On x86, return address is always popped in word_mode. eh_return needs to put EH return address in word_mode on stack. gcc/ Backport from mainline PR target/87014 * config/i386/i386.md (eh_return): Always update EH return address in word_mode. gcc/testsuite/ Backport from mainline PR target/87014 * g++.dg/torture/pr87014.C: New file. From-SVN: r263744 --- gcc/ChangeLog | 9 +++++++ gcc/config/i386/i386.md | 5 +++- gcc/testsuite/ChangeLog | 8 ++++++ gcc/testsuite/g++.dg/torture/pr87014.C | 37 ++++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/torture/pr87014.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 79c125578d94..777b8628938c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2018-08-21 H.J. Lu + + Backport from mainline + 2018-08-20 H.J. Lu + + PR target/87014 + * config/i386/i386.md (eh_return): Always update EH return + address in word_mode. + 2018-08-17 John David Anglin Backport from mainline diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md index c5dae5ffe7d2..3ae4e70b4fac 100644 --- a/gcc/config/i386/i386.md +++ b/gcc/config/i386/i386.md @@ -12592,7 +12592,10 @@ stack address we wish to restore. */ tmp = gen_rtx_PLUS (Pmode, arg_pointer_rtx, sa); tmp = plus_constant (Pmode, tmp, -UNITS_PER_WORD); - tmp = gen_rtx_MEM (Pmode, tmp); + /* Return address is always in word_mode. */ + tmp = gen_rtx_MEM (word_mode, tmp); + if (GET_MODE (ra) != word_mode) + ra = convert_to_mode (word_mode, ra, 1); emit_move_insn (tmp, ra); emit_jump_insn (gen_eh_return_internal ()); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 27db12935f2f..e30ebd5e9047 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2018-08-21 H.J. Lu + + Backport from mainline + 2018-08-20 H.J. Lu + + PR target/87014 + * g++.dg/torture/pr87014.C: New file. + 2018-08-21 Szabolcs Nagy Backport from mainline diff --git a/gcc/testsuite/g++.dg/torture/pr87014.C b/gcc/testsuite/g++.dg/torture/pr87014.C new file mode 100644 index 000000000000..614954ef464c --- /dev/null +++ b/gcc/testsuite/g++.dg/torture/pr87014.C @@ -0,0 +1,37 @@ +// { dg-do run } + +void +fillstack () +{ + long long foo[] = + { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + }; +} + +void +f (long long=-1,long long=-1,long long=-1,long long=-1, + long long=-1,long long=-1,long long arg7_on_stack=-1) +{ + throw 0; +} + +void +g() +{ + try + { + f (); + } + catch (int) + { + } +} + +int +main() +{ + fillstack (); + g (); + return 0; +} -- 2.47.2