From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gcc-patches:master commit in: 16.0.0/gentoo/
Date: Wed, 18 Jun 2025 09:53:57 +0000 (UTC) [thread overview]
Message-ID: <1750240424.9fc60320b4ac6921dfe7d97972a86082f19e33ba.sam@gentoo> (raw)
commit: 9fc60320b4ac6921dfe7d97972a86082f19e33ba
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 18 09:53:44 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 18 09:53:44 2025 +0000
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=9fc60320
16.0.0: update patch to add testcase
Signed-off-by: Sam James <sam <AT> gentoo.org>
...fstack-clash-protection-for-shrink-wrap-s.patch | 57 ++++++++++++++--------
1 file changed, 37 insertions(+), 20 deletions(-)
diff --git a/16.0.0/gentoo/85_all_PR120697-x86-Handle-fstack-clash-protection-for-shrink-wrap-s.patch b/16.0.0/gentoo/85_all_PR120697-x86-Handle-fstack-clash-protection-for-shrink-wrap-s.patch
index 08e3c49..803a74f 100644
--- a/16.0.0/gentoo/85_all_PR120697-x86-Handle-fstack-clash-protection-for-shrink-wrap-s.patch
+++ b/16.0.0/gentoo/85_all_PR120697-x86-Handle-fstack-clash-protection-for-shrink-wrap-s.patch
@@ -1,23 +1,26 @@
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=120697#c12
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=120697#c14
-From 4f80288ecb15195c8baa3e0081354c4cab78db36 Mon Sep 17 00:00:00 2001
+From 73fe038b1974b8f2867a765e5cbf5846abae4a25 Mon Sep 17 00:00:00 2001
From: Lili Cui <lili.cui@intel.com>
Date: Tue, 17 Jun 2025 23:49:03 -0700
-Subject: [PATCH] x86: Handle -fstack-clash-protection for shrink wrap separate
+Subject: [PATCH 12/12] x86: Fix shrink wrap separate ICE under
+ -fstack-clash-protection [PR120697]
gcc/ChangeLog:
- * config/i386/i386.cc (ix86_expand_prologue):
+ PR target/120697
+ * config/i386/i386.cc (ix86_expand_prologue):
Delete 3 assertions and related code.
gcc/testsuite/ChangeLog:
- * g++.target/i386/shrink_wrap_separate.C:
- Add -fstack-clash-protection into build options.
+ PR target/120697
+ * gcc.target/i386/stack-clash-protection.c: New test.
---
- gcc/config/i386/i386.cc | 14 +-------------
- .../g++.target/i386/shrink_wrap_separate.C | 2 +-
- 2 files changed, 2 insertions(+), 14 deletions(-)
+ gcc/config/i386/i386.cc | 14 +-------------
+ .../gcc.target/i386/stack-clash-protection.c | 19 +++++++++++++++++++
+ 2 files changed, 20 insertions(+), 13 deletions(-)
+ create mode 100644 gcc/testsuite/gcc.target/i386/stack-clash-protection.c
diff --git a/gcc/config/i386/i386.cc b/gcc/config/i386/i386.cc
index 3824b533989..6dce7cdfdcb 100644
@@ -74,16 +77,30 @@ index 3824b533989..6dce7cdfdcb 100644
pro_epilogue_adjust_stack (stack_pointer_rtx, stack_pointer_rtx,
GEN_INT (-allocate), -1,
m->fs.cfa_reg == stack_pointer_rtx);
-diff --git a/gcc/testsuite/g++.target/i386/shrink_wrap_separate.C b/gcc/testsuite/g++.target/i386/shrink_wrap_separate.C
-index 294dccde5d3..a1772c3a396 100644
---- a/gcc/testsuite/g++.target/i386/shrink_wrap_separate.C
-+++ b/gcc/testsuite/g++.target/i386/shrink_wrap_separate.C
-@@ -1,5 +1,5 @@
- /* { dg-do compile } */
--/* { dg-options "-O2 -fdump-rtl-pro_and_epilogue" } */
-+/* { dg-options "-O2 -fstack-clash-protection -fdump-rtl-pro_and_epilogue" } */
- typedef struct a b;
- typedef double c;
- struct a {
+diff --git a/gcc/testsuite/gcc.target/i386/stack-clash-protection.c b/gcc/testsuite/gcc.target/i386/stack-clash-protection.c
+new file mode 100644
+index 00000000000..5be28cb3ac7
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/i386/stack-clash-protection.c
+@@ -0,0 +1,19 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -fstack-clash-protection" } */
++
++int flag;
++void open();
++int getChar();
++typedef enum { QUOTE } CharType;
++typedef enum { UNQ } State;
++CharType getCharType();
++void expand() {
++ open();
++ if (flag)
++ return;
++ int ch = getChar();
++ State nextState = getCharType();
++ if (nextState)
++ while (ch)
++ ;
++}
--
2.34.1
next reply other threads:[~2025-06-18 9:54 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-18 9:53 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-07-22 23:56 [gentoo-commits] proj/gcc-patches:master commit in: 16.0.0/gentoo/ Sam James
2025-07-21 14:02 Sam James
2025-07-21 1:12 Sam James
2025-07-14 16:03 Sam James
2025-07-14 4:09 Sam James
2025-07-14 2:55 Sam James
2025-07-14 2:55 Sam James
2025-07-14 2:40 Sam James
2025-07-13 23:11 Sam James
2025-07-13 1:09 Sam James
2025-07-12 15:24 Sam James
2025-07-12 15:23 Sam James
2025-07-10 12:34 Sam James
2025-07-10 1:22 Sam James
2025-07-10 0:50 Sam James
2025-07-07 20:49 Sam James
2025-07-06 22:41 Sam James
2025-07-03 1:29 Sam James
2025-06-30 6:26 Sam James
2025-06-29 0:29 Sam James
2025-06-19 16:59 Sam James
2025-06-19 0:58 Sam James
2025-06-19 0:58 Sam James
2025-06-18 21:17 Sam James
2025-06-18 9:06 Sam James
2025-06-13 12:03 Sam James
2025-06-12 20:34 Sam James
2025-06-12 14:05 Sam James
2025-06-12 7:27 Sam James
2025-06-12 5:46 Sam James
2025-06-11 5:05 Sam James
2025-06-11 3:19 Sam James
2025-06-01 22:39 Sam James
2025-05-31 18:48 Sam James
2025-05-11 22:52 Sam James
2025-05-10 15:28 Sam James
2025-05-09 23:29 Sam James
2025-05-05 14:39 Sam James
2025-05-05 13:05 Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1750240424.9fc60320b4ac6921dfe7d97972a86082f19e33ba.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox