|
| 1 | +commit eb5698897c52702498938592d7f76e67d126451f |
| 2 | +Author: Eric Botcazou < [email protected]> |
| 3 | +Date: Wed May 5 22:48:51 2021 +0200 |
| 4 | + |
| 5 | + Fix PR target/100402 |
| 6 | + |
| 7 | + This is a regression for 64-bit Windows present from mainline down to the 9 |
| 8 | + branch and introduced by the fix for PR target/99234. Again SEH, but with |
| 9 | + a twist related to the way MinGW implements setjmp/longjmp, which turns out |
| 10 | + to be piggybacked on SEH with recent versions of MinGW, i.e. the longjmp |
| 11 | + performs a bona-fide unwinding of the stack, because it calls RtlUnwindEx |
| 12 | + with the second argument initially passed to setjmp, which is the result of |
| 13 | + __builtin_frame_address (0) in the MinGW header file: |
| 14 | + |
| 15 | + define setjmp(BUF) _setjmp((BUF), __builtin_frame_address (0)) |
| 16 | + |
| 17 | + This means that we directly expose the frame pointer to the SEH machinery |
| 18 | + here (unlike with regular exception handling where we use an intermediate |
| 19 | + CFA) and thus that we cannot do whatever we want with it. The old code |
| 20 | + would leave it unaligned, i.e. not multiple of 16, whereas the new code |
| 21 | + aligns it, but this breaks for some reason; at least it appears that a |
| 22 | + .seh_setframe directive with 0 as second argument always works, so the |
| 23 | + fix aligns it this way. |
| 24 | + |
| 25 | + gcc/ |
| 26 | + PR target/100402 |
| 27 | + * config/i386/i386.c (ix86_compute_frame_layout): For a SEH target, |
| 28 | + always return the establisher frame for __builtin_frame_address (0). |
| 29 | + gcc/testsuite/ |
| 30 | + * gcc.c-torture/execute/20210505-1.c: New test. |
| 31 | + |
| 32 | +diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c |
| 33 | +index 2f838840e96..06ad1b2274e 100644 |
| 34 | +--- a/gcc/config/i386/i386.c |
| 35 | ++++ b/gcc/config/i386/i386.c |
| 36 | +@@ -6356,12 +6356,29 @@ ix86_compute_frame_layout (void) |
| 37 | + area, see the SEH code in config/i386/winnt.c for the rationale. */ |
| 38 | + frame->hard_frame_pointer_offset = frame->sse_reg_save_offset; |
| 39 | + |
| 40 | +- /* If we can leave the frame pointer where it is, do so. Also, return |
| 41 | ++ /* If we can leave the frame pointer where it is, do so; however return |
| 42 | + the establisher frame for __builtin_frame_address (0) or else if the |
| 43 | +- frame overflows the SEH maximum frame size. */ |
| 44 | ++ frame overflows the SEH maximum frame size. |
| 45 | ++ |
| 46 | ++ Note that the value returned by __builtin_frame_address (0) is quite |
| 47 | ++ constrained, because setjmp is piggybacked on the SEH machinery with |
| 48 | ++ recent versions of MinGW: |
| 49 | ++ |
| 50 | ++ # elif defined(__SEH__) |
| 51 | ++ # if defined(__aarch64__) || defined(_ARM64_) |
| 52 | ++ # define setjmp(BUF) _setjmp((BUF), __builtin_sponentry()) |
| 53 | ++ # elif (__MINGW_GCC_VERSION < 40702) |
| 54 | ++ # define setjmp(BUF) _setjmp((BUF), mingw_getsp()) |
| 55 | ++ # else |
| 56 | ++ # define setjmp(BUF) _setjmp((BUF), __builtin_frame_address (0)) |
| 57 | ++ # endif |
| 58 | ++ |
| 59 | ++ and the second argument passed to _setjmp, if not null, is forwarded |
| 60 | ++ to the TargetFrame parameter of RtlUnwindEx by longjmp (after it has |
| 61 | ++ built an ExceptionRecord on the fly describing the setjmp buffer). */ |
| 62 | + const HOST_WIDE_INT diff |
| 63 | + = frame->stack_pointer_offset - frame->hard_frame_pointer_offset; |
| 64 | +- if (diff <= 255) |
| 65 | ++ if (diff <= 255 && !crtl->accesses_prior_frames) |
| 66 | + { |
| 67 | + /* The resulting diff will be a multiple of 16 lower than 255, |
| 68 | + i.e. at most 240 as required by the unwind data structure. */ |
0 commit comments