Author: moorabbit Date: 2025-08-08T12:50:49-07:00 New Revision: 6894abecadf8d875bbfca82445ded13d530a0066
URL: https://github.com/llvm/llvm-project/commit/6894abecadf8d875bbfca82445ded13d530a0066 DIFF: https://github.com/llvm/llvm-project/commit/6894abecadf8d875bbfca82445ded13d530a0066.diff LOG: [Clang][Basic] Add `__has_feature` checks for CFI sanitizers (#151348) Add `__has_feature` checks control flow integrity sanitizers. Fixes #151022 Added: clang/test/Lexer/has_feature_cfi.c Modified: clang/include/clang/Basic/Features.def Removed: ################################################################################ diff --git a/clang/include/clang/Basic/Features.def b/clang/include/clang/Basic/Features.def index 72f23614aef11..c58e3f2400adc 100644 --- a/clang/include/clang/Basic/Features.def +++ b/clang/include/clang/Basic/Features.def @@ -303,6 +303,14 @@ 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_sanitizer, LangOpts.Sanitize.hasOneOf(SanitizerKind::CFI)) +FEATURE(cfi_cast_strict_sanitizer, LangOpts.Sanitize.has(SanitizerKind::CFICastStrict)) +FEATURE(cfi_derived_cast_sanitizer, LangOpts.Sanitize.has(SanitizerKind::CFIDerivedCast)) +FEATURE(cfi_icall_sanitizer, LangOpts.Sanitize.has(SanitizerKind::CFIICall)) +FEATURE(cfi_mfcall_sanitizer, LangOpts.Sanitize.has(SanitizerKind::CFIMFCall)) +FEATURE(cfi_unrelated_cast_sanitizer, LangOpts.Sanitize.has(SanitizerKind::CFIUnrelatedCast)) +FEATURE(cfi_nvcall_sanitizer, LangOpts.Sanitize.has(SanitizerKind::CFINVCall)) +FEATURE(cfi_vcall_sanitizer, LangOpts.Sanitize.has(SanitizerKind::CFIVCall)) 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 new file mode 100644 index 0000000000000..a4e5803f68ce7 --- /dev/null +++ b/clang/test/Lexer/has_feature_cfi.c @@ -0,0 +1,87 @@ +// REQUIRES: target={{x86_64.*-linux.*}} + +// RUN: %clang -E -fvisibility=hidden -flto -fno-sanitize-ignorelist -fsanitize=cfi -c %s -o - | FileCheck %s --check-prefix=CHECK-CFI +// RUN: %clang -E -fvisibility=hidden -flto -fno-sanitize-ignorelist -fsanitize=cfi -fsanitize-cfi-cross-dso -c %s -o - | FileCheck %s --check-prefix=CHECK-CFI +// RUN: %clang -E -fvisibility=hidden -flto -fno-sanitize-ignorelist -fsanitize=cfi -fno-sanitize=cfi-nvcall,cfi-vcall,cfi-mfcall,cfi-icall -c %s -o - | FileCheck %s --check-prefix=CHECK-CFI +// CHECK-CFI: CFISanitizerEnabled + +// RUN: %clang -E -c %s -o - | FileCheck %s --check-prefix=CHECK-NO-CFI +// CHECK-NO-CFI: CFISanitizerDisabled + +// RUN: %clang -E -fsanitize=kcfi -c %s -o - | FileCheck %s --check-prefixes=CHECK-KCFI,CHECK-NO-CFI +// CHECK-KCFI: KCFISanitizerEnabled + +// RUN: %clang -E -fsanitize=cfi-cast-strict -c %s -o - | FileCheck %s --check-prefix=CHECK-CFI-CAST-STRICT +// CHECK-CFI-CAST-STRICT: CFICastStrictSanitizerEnabled + +// RUN: %clang -E -fvisibility=hidden -flto -fno-sanitize-ignorelist -fsanitize=cfi-derived-cast -c %s -o - | FileCheck %s --check-prefixes=CHECK-CFI,CHECK-CFI-DERIVED-CAST +// CHECK-CFI-DERIVED-CAST: CFIDerivedCastSanitizerEnabled + +// RUN: %clang -E -fvisibility=hidden -flto -fno-sanitize-ignorelist -fsanitize=cfi-icall -c %s -o - | FileCheck %s --check-prefixes=CHECK-CFI,CHECK-CFI-ICALL +// CHECK-CFI-ICALL: CFIICallSanitizerEnabled + +// RUN: %clang -E -fvisibility=hidden -flto -fno-sanitize-ignorelist -fsanitize=cfi-mfcall -c %s -o - | FileCheck %s --check-prefixes=CHECK-CFI,CHECK-CFI-MFCALL +// CHECK-CFI-MFCALL: CFIMFCallSanitizerEnabled + +// RUN: %clang -E -fvisibility=hidden -flto -fno-sanitize-ignorelist -fsanitize=cfi-unrelated-cast -c %s -o - | FileCheck %s --check-prefixes=CHECK-CFI,CHECK-CFI-UNRELATED-CAST +// CHECK-CFI-UNRELATED-CAST: CFIUnrelatedCastSanitizerEnabled + +// RUN: %clang -E -fvisibility=hidden -flto -fno-sanitize-ignorelist -fsanitize=cfi-nvcall -c %s -o - | FileCheck %s --check-prefixes=CHECK-CFI,CHECK-CFI-NVCALL +// CHECK-CFI-NVCALL: CFINVCallSanitizerEnabled + +// RUN: %clang -E -fvisibility=hidden -flto -fno-sanitize-ignorelist -fsanitize=cfi-vcall -c %s -o - | FileCheck %s --check-prefixes=CHECK-CFI,CHECK-CFI-VCALL +// CHECK-CFI-VCALL: CFIVCallSanitizerEnabled + +#if __has_feature(cfi_sanitizer) +int CFISanitizerEnabled(); +#else +int CFISanitizerDisabled(); +#endif + +#if __has_feature(kcfi) +int KCFISanitizerEnabled(); +#else +int KCFISanitizerDisabled(); +#endif + +#if __has_feature(cfi_cast_strict_sanitizer) +int CFICastStrictSanitizerEnabled(); +#else +int CFICastStrictSanitizerDisabled(); +#endif + +#if __has_feature(cfi_derived_cast_sanitizer) +int CFIDerivedCastSanitizerEnabled(); +#else +int CFIDerivedCastSanitizerDisabled(); +#endif + +#if __has_feature(cfi_icall_sanitizer) +int CFIICallSanitizerEnabled(); +#else +int CFIICallSanitizerDisabled(); +#endif + +#if __has_feature(cfi_mfcall_sanitizer) +int CFIMFCallSanitizerEnabled(); +#else +int CFIMFCallSanitizerDisabled(); +#endif + +#if __has_feature(cfi_unrelated_cast_sanitizer) +int CFIUnrelatedCastSanitizerEnabled(); +#else +int CFIUnrelatedCastSanitizerDisabled(); +#endif + +#if __has_feature(cfi_nvcall_sanitizer) +int CFINVCallSanitizerEnabled(); +#else +int CFINVCallSanitizerDisabled(); +#endif + +#if __has_feature(cfi_vcall_sanitizer) +int CFIVCallSanitizerEnabled(); +#else +int CFIVCallSanitizerDisabled(); +#endif _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
