https://github.com/moorabbit updated
https://github.com/llvm/llvm-project/pull/151348
>From 49149a0334d8882d24cc35a1d8f3f2af72343145 Mon Sep 17 00:00:00 2001
From: moorabbit <moorab...@proton.me>
Date: Wed, 30 Jul 2025 10:50:58 -0400
Subject: [PATCH 1/4] [Clang][Basic] Enable `__has_feature(cfi)`
Support `__has_feature(cfi)` to check for control flow integrity sanitizers.
---
clang/include/clang/Basic/Features.def | 1 +
clang/include/clang/Basic/Sanitizers.def | 2 +-
clang/test/Lexer/has_feature_cfi.c | 18 ++++++++++++++++++
3 files changed, 20 insertions(+), 1 deletion(-)
create mode 100644 clang/test/Lexer/has_feature_cfi.c
diff --git a/clang/include/clang/Basic/Features.def
b/clang/include/clang/Basic/Features.def
index 72f23614aef11..4beb9a51dcf0b 100644
--- a/clang/include/clang/Basic/Features.def
+++ b/clang/include/clang/Basic/Features.def
@@ -303,6 +303,7 @@ FEATURE(is_trivially_assignable, LangOpts.CPlusPlus)
FEATURE(is_trivially_constructible, LangOpts.CPlusPlus)
FEATURE(is_trivially_copyable, LangOpts.CPlusPlus)
FEATURE(is_union, LangOpts.CPlusPlus)
+FEATURE(cfi, LangOpts.Sanitize.hasOneOf(SanitizerKind::CFI))
FEATURE(kcfi, LangOpts.Sanitize.has(SanitizerKind::KCFI))
FEATURE(kcfi_arity, LangOpts.Sanitize.has(SanitizerKind::KCFI))
FEATURE(modules, LangOpts.Modules)
diff --git a/clang/include/clang/Basic/Sanitizers.def
b/clang/include/clang/Basic/Sanitizers.def
index 1d0e97cc7fb4c..aad758ceb9d40 100644
--- a/clang/include/clang/Basic/Sanitizers.def
+++ b/clang/include/clang/Basic/Sanitizers.def
@@ -134,7 +134,7 @@ SANITIZER("cfi-nvcall", CFINVCall)
SANITIZER("cfi-vcall", CFIVCall)
SANITIZER_GROUP("cfi", CFI,
CFIDerivedCast | CFIICall | CFIMFCall | CFIUnrelatedCast |
- CFINVCall | CFIVCall)
+ CFINVCall | CFIVCall | CFICastStrict)
// Kernel Control Flow Integrity
SANITIZER("kcfi", KCFI)
diff --git a/clang/test/Lexer/has_feature_cfi.c
b/clang/test/Lexer/has_feature_cfi.c
new file mode 100644
index 0000000000000..df472944e6d9e
--- /dev/null
+++ b/clang/test/Lexer/has_feature_cfi.c
@@ -0,0 +1,18 @@
+// RUN: %clang_cc1 -E -fsanitize=cfi-cast-strict -o - %s | FileCheck
--check-prefix=CHECK-CFISAN %s
+// RUN: %clang_cc1 -E -fsanitize=cfi-derived-cast -o - %s | FileCheck
--check-prefix=CHECK-CFISAN %s
+// RUN: %clang_cc1 -E -fsanitize=cfi-icall -o - %s | FileCheck
--check-prefix=CHECK-CFISAN %s
+// RUN: %clang_cc1 -E -fsanitize=cfi-mfcall -o - %s | FileCheck
--check-prefix=CHECK-CFISAN %s
+// RUN: %clang_cc1 -E -fsanitize=cfi-unrelated-cast -o - %s | FileCheck
--check-prefix=CHECK-CFISAN %s
+// RUN: %clang_cc1 -E -fsanitize=cfi-nvcall -o - %s | FileCheck
--check-prefix=CHECK-CFISAN %s
+// RUN: %clang_cc1 -E -fsanitize=cfi-vcall -o - %s | FileCheck
--check-prefix=CHECK-CFISAN %s
+// RUN: %clang_cc1 -E %s -o - | FileCheck --check-prefix=CHECK-NO-CFISAN %s
+
+#if __has_feature(cfi)
+int CFISanitizerEnabled();
+#else
+int CFISanitizerDisabled();
+#endif
+
+// CHECK-CFISAN: CFISanitizerEnabled
+// CHECK-NO-CFISAN: CFISanitizerDisabled
+
>From 75b03606601a8dfe689f68bd418c6eaafa40ae52 Mon Sep 17 00:00:00 2001
From: moorabbit <moorab...@proton.me>
Date: Thu, 31 Jul 2025 06:48:57 -0400
Subject: [PATCH 2/4] Add more test cases
---
clang/include/clang/Basic/Features.def | 2 +-
clang/test/Lexer/has_feature_cfi.c | 15 ++++++++++++++-
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/clang/include/clang/Basic/Features.def
b/clang/include/clang/Basic/Features.def
index 4beb9a51dcf0b..35833268755f5 100644
--- a/clang/include/clang/Basic/Features.def
+++ b/clang/include/clang/Basic/Features.def
@@ -303,7 +303,7 @@ FEATURE(is_trivially_assignable, LangOpts.CPlusPlus)
FEATURE(is_trivially_constructible, LangOpts.CPlusPlus)
FEATURE(is_trivially_copyable, LangOpts.CPlusPlus)
FEATURE(is_union, LangOpts.CPlusPlus)
-FEATURE(cfi, LangOpts.Sanitize.hasOneOf(SanitizerKind::CFI))
+FEATURE(cfi, LangOpts.Sanitize.hasOneOf(SanitizerKind::CFI |
SanitizerKind::KCFI))
FEATURE(kcfi, LangOpts.Sanitize.has(SanitizerKind::KCFI))
FEATURE(kcfi_arity, LangOpts.Sanitize.has(SanitizerKind::KCFI))
FEATURE(modules, LangOpts.Modules)
diff --git a/clang/test/Lexer/has_feature_cfi.c
b/clang/test/Lexer/has_feature_cfi.c
index df472944e6d9e..b7b3db4897ab1 100644
--- a/clang/test/Lexer/has_feature_cfi.c
+++ b/clang/test/Lexer/has_feature_cfi.c
@@ -5,7 +5,20 @@
// RUN: %clang_cc1 -E -fsanitize=cfi-unrelated-cast -o - %s | FileCheck
--check-prefix=CHECK-CFISAN %s
// RUN: %clang_cc1 -E -fsanitize=cfi-nvcall -o - %s | FileCheck
--check-prefix=CHECK-CFISAN %s
// RUN: %clang_cc1 -E -fsanitize=cfi-vcall -o - %s | FileCheck
--check-prefix=CHECK-CFISAN %s
-// RUN: %clang_cc1 -E %s -o - | FileCheck --check-prefix=CHECK-NO-CFISAN %s
+
+// RUN: %clang_cc1 -E -fsanitize=kcfi -o - %s | FileCheck
--check-prefix=CHECK-CFISAN %s
+
+// RUN: %clang -E --target=x86_64-linux-gnu -fvisibility=hidden -fsanitize=cfi
-flto -c %s -o - | FileCheck %s --check-prefix=CHECK-CFISAN
+// RUN: %clang -E --target=x86_64-linux-gnu -fvisibility=hidden -fsanitize=cfi
-fsanitize-cfi-cross-dso -flto -c %s -o - | FileCheck %s
--check-prefix=CHECK-CFISAN
+
+// Disable CFI sanitizers.
+// RUN: %clang -E --target=x86_64-linux-gnu -fvisibility=hidden
-fno-sanitize=cfi -flto -c %s -o - | FileCheck %s --check-prefix=CHECK-NO-CFISAN
+
+// Disable some but not all CFI schemes.
+// RUN: %clang -E --target=x86_64-linux-gnu -fvisibility=hidden -fsanitize=cfi
-fno-sanitize-cfi-cross-dso
-fno-sanitize=cfi-nvcall,cfi-vcall,cfi-mfcall,cfi-icall -flto -c %s -o - |
FileCheck %s --check-prefix=CHECK-CFISAN
+
+// Disable all CFI schemes. This essentially disables CFI sanitizers.
+// RUN: %clang -E --target=x86_64-linux-gnu -fvisibility=hidden -fsanitize=cfi
-fno-sanitize-cfi-cross-dso
-fno-sanitize=cfi-nvcall,cfi-vcall,cfi-mfcall,cfi-icall,cfi-cast-strict,cfi-derived-cast,cfi-unrelated-cast
-flto -c %s -o - | FileCheck %s --check-prefix=CHECK-NO-CFISAN
#if __has_feature(cfi)
int CFISanitizerEnabled();
>From d741f6546cac859436fb0820b43381a4267079d4 Mon Sep 17 00:00:00 2001
From: moorabbit <moorab...@proton.me>
Date: Fri, 1 Aug 2025 00:01:47 -0400
Subject: [PATCH 3/4] add `-fno-sanitize-ignorelist` to fix CI build issue
---
clang/test/Lexer/has_feature_cfi.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/clang/test/Lexer/has_feature_cfi.c
b/clang/test/Lexer/has_feature_cfi.c
index b7b3db4897ab1..8227833701442 100644
--- a/clang/test/Lexer/has_feature_cfi.c
+++ b/clang/test/Lexer/has_feature_cfi.c
@@ -8,14 +8,14 @@
// RUN: %clang_cc1 -E -fsanitize=kcfi -o - %s | FileCheck
--check-prefix=CHECK-CFISAN %s
-// RUN: %clang -E --target=x86_64-linux-gnu -fvisibility=hidden -fsanitize=cfi
-flto -c %s -o - | FileCheck %s --check-prefix=CHECK-CFISAN
-// RUN: %clang -E --target=x86_64-linux-gnu -fvisibility=hidden -fsanitize=cfi
-fsanitize-cfi-cross-dso -flto -c %s -o - | FileCheck %s
--check-prefix=CHECK-CFISAN
+// RUN: %clang -E --target=x86_64-linux-gnu -fvisibility=hidden
-fno-sanitize-ignorelist -fsanitize=cfi -flto -c %s -o - | FileCheck %s
--check-prefix=CHECK-CFISAN
+// RUN: %clang -E --target=x86_64-linux-gnu -fvisibility=hidden
-fno-sanitize-ignorelist -fsanitize=cfi -fsanitize-cfi-cross-dso -flto -c %s -o
- | FileCheck %s --check-prefix=CHECK-CFISAN
// Disable CFI sanitizers.
// RUN: %clang -E --target=x86_64-linux-gnu -fvisibility=hidden
-fno-sanitize=cfi -flto -c %s -o - | FileCheck %s --check-prefix=CHECK-NO-CFISAN
// Disable some but not all CFI schemes.
-// RUN: %clang -E --target=x86_64-linux-gnu -fvisibility=hidden -fsanitize=cfi
-fno-sanitize-cfi-cross-dso
-fno-sanitize=cfi-nvcall,cfi-vcall,cfi-mfcall,cfi-icall -flto -c %s -o - |
FileCheck %s --check-prefix=CHECK-CFISAN
+// RUN: %clang -E --target=x86_64-linux-gnu -fvisibility=hidden
-fno-sanitize-ignorelist -fsanitize=cfi -fno-sanitize-cfi-cross-dso
-fno-sanitize=cfi-nvcall,cfi-vcall,cfi-mfcall,cfi-icall -flto -c %s -o - |
FileCheck %s --check-prefix=CHECK-CFISAN
// Disable all CFI schemes. This essentially disables CFI sanitizers.
// RUN: %clang -E --target=x86_64-linux-gnu -fvisibility=hidden -fsanitize=cfi
-fno-sanitize-cfi-cross-dso
-fno-sanitize=cfi-nvcall,cfi-vcall,cfi-mfcall,cfi-icall,cfi-cast-strict,cfi-derived-cast,cfi-unrelated-cast
-flto -c %s -o - | FileCheck %s --check-prefix=CHECK-NO-CFISAN
>From b6a7ce7e3f4f51ca71f813d931362a710abd7d87 Mon Sep 17 00:00:00 2001
From: moorabbit <moorab...@proton.me>
Date: Fri, 1 Aug 2025 15:14:13 -0400
Subject: [PATCH 4/4] Fix driver test failure
---
clang/include/clang/Basic/Features.def | 2 +-
clang/include/clang/Basic/Sanitizers.def | 2 +-
clang/test/Lexer/has_feature_cfi.c | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/clang/include/clang/Basic/Features.def
b/clang/include/clang/Basic/Features.def
index 35833268755f5..371fba29a1776 100644
--- a/clang/include/clang/Basic/Features.def
+++ b/clang/include/clang/Basic/Features.def
@@ -303,7 +303,7 @@ FEATURE(is_trivially_assignable, LangOpts.CPlusPlus)
FEATURE(is_trivially_constructible, LangOpts.CPlusPlus)
FEATURE(is_trivially_copyable, LangOpts.CPlusPlus)
FEATURE(is_union, LangOpts.CPlusPlus)
-FEATURE(cfi, LangOpts.Sanitize.hasOneOf(SanitizerKind::CFI |
SanitizerKind::KCFI))
+FEATURE(cfi, LangOpts.Sanitize.hasOneOf(SanitizerKind::CFI |
SanitizerKind::CFICastStrict | SanitizerKind::KCFI))
FEATURE(kcfi, LangOpts.Sanitize.has(SanitizerKind::KCFI))
FEATURE(kcfi_arity, LangOpts.Sanitize.has(SanitizerKind::KCFI))
FEATURE(modules, LangOpts.Modules)
diff --git a/clang/include/clang/Basic/Sanitizers.def
b/clang/include/clang/Basic/Sanitizers.def
index aad758ceb9d40..1d0e97cc7fb4c 100644
--- a/clang/include/clang/Basic/Sanitizers.def
+++ b/clang/include/clang/Basic/Sanitizers.def
@@ -134,7 +134,7 @@ SANITIZER("cfi-nvcall", CFINVCall)
SANITIZER("cfi-vcall", CFIVCall)
SANITIZER_GROUP("cfi", CFI,
CFIDerivedCast | CFIICall | CFIMFCall | CFIUnrelatedCast |
- CFINVCall | CFIVCall | CFICastStrict)
+ CFINVCall | CFIVCall)
// Kernel Control Flow Integrity
SANITIZER("kcfi", KCFI)
diff --git a/clang/test/Lexer/has_feature_cfi.c
b/clang/test/Lexer/has_feature_cfi.c
index 8227833701442..e0f9d4aeb3371 100644
--- a/clang/test/Lexer/has_feature_cfi.c
+++ b/clang/test/Lexer/has_feature_cfi.c
@@ -8,17 +8,17 @@
// RUN: %clang_cc1 -E -fsanitize=kcfi -o - %s | FileCheck
--check-prefix=CHECK-CFISAN %s
-// RUN: %clang -E --target=x86_64-linux-gnu -fvisibility=hidden
-fno-sanitize-ignorelist -fsanitize=cfi -flto -c %s -o - | FileCheck %s
--check-prefix=CHECK-CFISAN
-// RUN: %clang -E --target=x86_64-linux-gnu -fvisibility=hidden
-fno-sanitize-ignorelist -fsanitize=cfi -fsanitize-cfi-cross-dso -flto -c %s -o
- | FileCheck %s --check-prefix=CHECK-CFISAN
+// RUN: %clang -E -fvisibility=hidden -fno-sanitize-ignorelist -fsanitize=cfi
-flto -c %s -o - | FileCheck %s --check-prefix=CHECK-CFISAN
+// RUN: %clang -E -fvisibility=hidden -fno-sanitize-ignorelist -fsanitize=cfi
-fsanitize-cfi-cross-dso -flto -c %s -o - | FileCheck %s
--check-prefix=CHECK-CFISAN
// Disable CFI sanitizers.
-// RUN: %clang -E --target=x86_64-linux-gnu -fvisibility=hidden
-fno-sanitize=cfi -flto -c %s -o - | FileCheck %s --check-prefix=CHECK-NO-CFISAN
+// RUN: %clang -E -fvisibility=hidden -fno-sanitize=cfi -flto -c %s -o - |
FileCheck %s --check-prefix=CHECK-NO-CFISAN
// Disable some but not all CFI schemes.
-// RUN: %clang -E --target=x86_64-linux-gnu -fvisibility=hidden
-fno-sanitize-ignorelist -fsanitize=cfi -fno-sanitize-cfi-cross-dso
-fno-sanitize=cfi-nvcall,cfi-vcall,cfi-mfcall,cfi-icall -flto -c %s -o - |
FileCheck %s --check-prefix=CHECK-CFISAN
+// RUN: %clang -E -fvisibility=hidden -fno-sanitize-ignorelist -fsanitize=cfi
-fno-sanitize-cfi-cross-dso
-fno-sanitize=cfi-nvcall,cfi-vcall,cfi-mfcall,cfi-icall -flto -c %s -o - |
FileCheck %s --check-prefix=CHECK-CFISAN
// Disable all CFI schemes. This essentially disables CFI sanitizers.
-// RUN: %clang -E --target=x86_64-linux-gnu -fvisibility=hidden -fsanitize=cfi
-fno-sanitize-cfi-cross-dso
-fno-sanitize=cfi-nvcall,cfi-vcall,cfi-mfcall,cfi-icall,cfi-cast-strict,cfi-derived-cast,cfi-unrelated-cast
-flto -c %s -o - | FileCheck %s --check-prefix=CHECK-NO-CFISAN
+// RUN: %clang -E -fvisibility=hidden -fsanitize=cfi
-fno-sanitize-cfi-cross-dso
-fno-sanitize=cfi-nvcall,cfi-vcall,cfi-mfcall,cfi-icall,cfi-cast-strict,cfi-derived-cast,cfi-unrelated-cast
-flto -c %s -o - | FileCheck %s --check-prefix=CHECK-NO-CFISAN
#if __has_feature(cfi)
int CFISanitizerEnabled();
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
