-
Notifications
You must be signed in to change notification settings - Fork 15.1k
[Clang][Basic] Add __has_feature checks for CFI sanitizers
#151348
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
49149a0
[Clang][Basic] Enable `__has_feature(cfi)`
moorabbit 75b0360
Add more test cases
moorabbit d741f65
add `-fno-sanitize-ignorelist` to fix CI build issue
moorabbit b6a7ce7
Fix driver test failure
moorabbit 7da5378
PiJoules suggestion
moorabbit fded769
PiJoules suggestions
moorabbit cc13c4b
Fix test failure on windows
moorabbit 64556aa
Specify the target platform the test is allowed to run on
moorabbit f0094c0
Merge branch 'main' into has-feature-cfi
moorabbit 6e0c3c7
Merge branch 'main' into has-feature-cfi
moorabbit File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| // 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 | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's keep kcfi separated for now before we decide to combine them.
// CHECK-KCFI: KCFISanitizerEnabledThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree to separate them, but I don't think we can change that later as soon as anyone uses that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good. Tried to fix it in a new commit.