aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2022-03-04 05:53:14 -0800
committerH.J. Lu <hjl.tools@gmail.com>2022-03-08 09:56:02 -0800
commit23ed4df521db9d66782d3f9cf291fc2564cf313a (patch)
tree78b75ca4955396d2f68659881aa2597748d47601 /gcc
parent796f5220c808bc37adbd1081476589ab1a5d7ac3 (diff)
downloadgcc-23ed4df521db9d66782d3f9cf291fc2564cf313a.zip
gcc-23ed4df521db9d66782d3f9cf291fc2564cf313a.tar.gz
gcc-23ed4df521db9d66782d3f9cf291fc2564cf313a.tar.bz2
x86: Disallow unsupported EH return
Disallow stack realignment and regparm nested function with EH return since they don't work together. gcc/ PR target/104781 * config/i386/i386.cc (ix86_expand_epilogue): Sorry if there is stack realignment or regparm nested function with EH return. gcc/testsuite/ PR target/104781 * gcc.target/i386/eh_return-1.c: Add -mincoming-stack-boundary=4. * gcc.target/i386/eh_return-2.c: Likewise.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/config/i386/i386.cc11
-rw-r--r--gcc/testsuite/gcc.target/i386/eh_return-1.c2
-rw-r--r--gcc/testsuite/gcc.target/i386/eh_return-2.c2
3 files changed, 9 insertions, 6 deletions
diff --git a/gcc/config/i386/i386.cc b/gcc/config/i386/i386.cc
index efa947f..4121f98 100644
--- a/gcc/config/i386/i386.cc
+++ b/gcc/config/i386/i386.cc
@@ -9444,12 +9444,15 @@ ix86_expand_epilogue (int style)
rtx sa = EH_RETURN_STACKADJ_RTX;
rtx_insn *insn;
- /* %ecx can't be used for both DRAP register and eh_return. */
- if (crtl->drap_reg)
- gcc_assert (REGNO (crtl->drap_reg) != CX_REG);
+ /* Stack realignment doesn't work with eh_return. */
+ if (crtl->stack_realign_needed)
+ sorry ("Stack realignment not supported with "
+ "%<__builtin_eh_return%>");
/* regparm nested functions don't work with eh_return. */
- gcc_assert (!ix86_static_chain_on_stack);
+ if (ix86_static_chain_on_stack)
+ sorry ("regparm nested function not supported with "
+ "%<__builtin_eh_return%>");
if (frame_pointer_needed)
{
diff --git a/gcc/testsuite/gcc.target/i386/eh_return-1.c b/gcc/testsuite/gcc.target/i386/eh_return-1.c
index b21fd75..43f94f0 100644
--- a/gcc/testsuite/gcc.target/i386/eh_return-1.c
+++ b/gcc/testsuite/gcc.target/i386/eh_return-1.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -march=haswell -mno-avx512f -mtune-ctrl=avx256_move_by_pieces" } */
+/* { dg-options "-O2 -mincoming-stack-boundary=4 -march=haswell -mno-avx512f -mtune-ctrl=avx256_move_by_pieces" } */
struct _Unwind_Context
{
diff --git a/gcc/testsuite/gcc.target/i386/eh_return-2.c b/gcc/testsuite/gcc.target/i386/eh_return-2.c
index f23f449..cb762f9 100644
--- a/gcc/testsuite/gcc.target/i386/eh_return-2.c
+++ b/gcc/testsuite/gcc.target/i386/eh_return-2.c
@@ -1,6 +1,6 @@
/* PR target/101772 */
/* { dg-do compile } */
-/* { dg-additional-options "-O0 -march=x86-64 -mstackrealign" } */
+/* { dg-additional-options "-O0 -mincoming-stack-boundary=4 -march=x86-64 -mstackrealign" } */
struct _Unwind_Context _Unwind_Resume_or_Rethrow_this_context;