From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1285) id 1C62B3858D33; Wed, 15 Feb 2023 22:46:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1C62B3858D33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1676501200; bh=edAj1hWtxv0NqHMLz0FbALfUAGVDP9iFmuwr1cZ4phw=; h=From:To:Subject:Date:From; b=hvv4gL2P0HWCs+oTL2BooZIP+FoGBcHhna7grNy0iucoN7KJGoZ//5Nr0PqHQ1bP2 83DUj3vFMsIwjfjvrNE90PwPiUBUkhqmUIK1vO0JWls3bf4J6YacRCjtUY1Zs0hi2T I5sUpceVuShFtkGlzrkMbtuQBAZIdmererab6PpY= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Eric Botcazou To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-9177] Fix PR target/90458 X-Act-Checkin: gcc X-Git-Author: Eric Botcazou X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: 825a47f1bb9a42df65157d4dc0a11b2c054e97cc X-Git-Newrev: 25b80834e2ce6725e676ef33fbf0d009b3173955 Message-Id: <20230215224640.1C62B3858D33@sourceware.org> Date: Wed, 15 Feb 2023 22:46:40 +0000 (GMT) List-Id: https://gcc.gnu.org/g:25b80834e2ce6725e676ef33fbf0d009b3173955 commit r12-9177-g25b80834e2ce6725e676ef33fbf0d009b3173955 Author: Eric Botcazou Date: Wed Feb 15 23:32:12 2023 +0100 Fix PR target/90458 This is the incompatibility of -fstack-clash-protection with Windows SEH. Now the Windows ports always enable TARGET_STACK_PROBE, which means that the stack is always probed (out of line) so -fstack-clash-protection does nothing more. gcc/ PR target/90458 * config/i386/i386.cc (ix86_compute_frame_layout): Disable the effects of -fstack-clash-protection for TARGET_STACK_PROBE. (ix86_expand_prologue): Likewise. Diff: --- gcc/config/i386/i386.cc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gcc/config/i386/i386.cc b/gcc/config/i386/i386.cc index 962f8c82b48..669b1efdb62 100644 --- a/gcc/config/i386/i386.cc +++ b/gcc/config/i386/i386.cc @@ -6818,7 +6818,9 @@ ix86_compute_frame_layout (void) stack clash protections are enabled and the allocated frame is larger than the probe interval, then use pushes to save callee saved registers. */ - || (flag_stack_clash_protection && to_allocate > get_probe_interval ())) + || (flag_stack_clash_protection + && !ix86_target_stack_probe () + && to_allocate > get_probe_interval ())) frame->save_regs_using_mov = false; if (ix86_using_red_zone () @@ -8703,8 +8705,11 @@ ix86_expand_prologue (void) sse_registers_saved = true; } - /* If stack clash protection is requested, then probe the stack. */ - if (allocate >= 0 && flag_stack_clash_protection) + /* If stack clash protection is requested, then probe the stack, unless it + is already probed on the target. */ + if (allocate >= 0 + && flag_stack_clash_protection + && !ix86_target_stack_probe ()) { ix86_adjust_stack_and_probe (allocate, int_registers_saved, false); allocate = 0;