Accumulate multiple -Zsanitizer target modifiers#157788
Open
PiJoules wants to merge 1 commit into
Open
Conversation
Collaborator
|
Some changes occurred in tests/codegen-llvm/sanitizer cc @rcvalle |
rustbot
added
PG-exploit-mitigations
Collaborator
|
rustbot has assigned @petrochenkov. Use Why was this reviewer chosen?The reviewer was selected based on:
|
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
rustbot
added
has-merge-commits
PiJoules
force-pushed
the
multiple-sanitizer-flags
branch
from
17905c2 to
fe9caed
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
rustbot
removed
has-merge-commits
PiJoules
force-pushed
the
multiple-sanitizer-flags
branch
2 times, most recently
from
b1fec2d to
0dcc9d6
Compare
Collaborator
|
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
PiJoules
force-pushed
the
multiple-sanitizer-flags
branch
from
0dcc9d6 to
76f555b
Compare
Collaborator
rustbot
added
A-LLVM
This comment has been minimized.
This comment has been minimized.
When passing multiple `-Zsanitizer` flags to the compiler (e.g., `-Zsanitizer=address -Zsanitizer=shadow-call-stack`), the options parser was overwriting the previous values in `target_modifiers` instead of accumulating them. This resulted in only the last sanitizer being recorded in the crate metadata's target modifiers, even though the frontend correctly enabled all of them. The only way to provide multiple sanitizers was to combine them into a comma-separated list passed to a single `-Zsanitizer=` flag, but this does not fit well into the GN build system where different targets may pass different combinations of sanitizer flags. Consequently, this caused spurious "incompatible target modifiers" ABI mismatch errors when linking against dependencies compiled with accumulated flags (e.g., `-Zsanitizer=address,shadow-call-stack`). Fix this by entry-modifying the `target_modifiers` map to accumulate the sanitizers as a comma-separated list when the option is `sanitizer`. Also add a codegen test verifying that both CFI and SafeStack attributes/metadata are present when enabled together via multiple flags. Test: ./x.py test tests/codegen-llvm/sanitizer/multiple-sanitizers.rs
PiJoules
force-pushed
the
multiple-sanitizer-flags
branch
from
76f555b to
1148afe
Compare
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
When passing multiple
-Zsanitizerflags to the compiler (e.g.,-Zsanitizer=address -Zsanitizer=shadow-call-stack), the options parser was overwriting the previous values intarget_modifiersinstead of accumulating them. This resulted in only the last sanitizer being recorded in the crate metadata's target modifiers, even though the frontend correctly enabled all of them. The only way to provide multiple sanitizers is to combine them into a comma-separated list passed to a single-Zsanitizer=flag, but this doesn't fit very well into the GN build system where different targets may pass different combinations of sanitizer flags.Consequently, this caused spurious "incompatible target modifiers" ABI mismatch errors when linking against dependencies compiled with accumulated flags.
Fix this by entry-modifying the
target_modifiersmap to accumulate the sanitizers as a comma-separated list when the option issanitizer.