Accumulate multiple -Zsanitizer target modifiers by PiJoules · Pull Request #157788 · rust-lang/rust

PiJoules · 2026-06-11T20:30:21Z

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 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_modifiers map to accumulate the sanitizers as a comma-separated list when the option is sanitizer.

rustbot · 2026-06-11T20:30:24Z

Some changes occurred in tests/codegen-llvm/sanitizer

cc @rcvalle

rustbot · 2026-06-11T20:30:27Z

r? @petrochenkov

rustbot has assigned @petrochenkov.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

Owners of files modified in this PR: compiler
compiler expanded to 73 candidates
Random selection from 20 candidates

rustbot · 2026-06-11T20:59:36Z

Some changes occurred in src/tools/cargo

cc @ehuss

Some changes occurred in src/tools/enzyme

cc @ZuseZ4

petrochenkov · 2026-06-15T16:15:48Z

@rustbot author

rust-bors · 2026-06-16T10:14:38Z

📌 Commit dad6583 has been approved by petrochenkov

It is now in the queue for this repository.

… r=petrochenkov Accumulate multiple -Zsanitizer target modifiers 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 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_modifiers` map to accumulate the sanitizers as a comma-separated list when the option is `sanitizer`.

JonathanBrouwer · 2026-06-16T14:39:52Z

💔 I suspect this PR failed tests as part of a rollup
@bors r-

After fixing the problem, consider running a try job for the failed job before re-approving.

Link to failure: #157963 (comment)

rust-bors · 2026-06-16T14:43:07Z

This pull request was unapproved.

This PR was contained in a rollup (#157963), which was unapproved.

View changes since this unapproval

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 · 2026-06-16T18:09:32Z

The presubmit failed since it attempted to run the multiple-sanitizers.rs codegen test on x86_64-unknown-linux-musl which doesn't support safestack. I updated the test such that it's only run if the target supports safestack and and CFI which the normal x86_64-unknown-linux triple supports.

@petrochenkov could you take another look?

petrochenkov · 2026-06-17T09:51:24Z

@bors try=test-various

rust-bors · 2026-06-17T09:51:28Z

Unknown command "try". Run @bors help or go to https://bors.rust-lang.org/help to see available commands.

petrochenkov · 2026-06-17T09:52:06Z

@bors try jobs=test-various

Accumulate multiple -Zsanitizer target modifiers try-job: test-various

rust-bors · 2026-06-17T11:44:29Z

☀️ Try build successful (CI)
Build commit: 3de26f1 (3de26f1c0c8da56b3ab1530e4498e2a5b843466c)
Base parent: 98594f4 (98594f404ee741f97fefbae4aca049cde911bc94)

petrochenkov · 2026-06-17T11:46:40Z

@bors r+

rust-bors · 2026-06-17T11:46:43Z

📌 Commit 115338b has been approved by petrochenkov

It is now in the queue for this repository.

… r=petrochenkov Accumulate multiple -Zsanitizer target modifiers 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 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_modifiers` map to accumulate the sanitizers as a comma-separated list when the option is `sanitizer`.

…uwer Rollup of 8 pull requests Successful merges: - #157788 (Accumulate multiple -Zsanitizer target modifiers) - #158012 (Stabilize `strip_circumfix`) - #157810 (Query the trait solver in slow path for `missing_debug_implementations`) - #157829 (tests: adapt two tests for LLVM 23 changes) - #157917 (Don't suggest adding `in` to a `for` loop that already has one) - #157967 (Preserve track_caller for by-value dyn vtable shims) - #158019 (delegation: add simple test for incremental compilation) - #158023 (Move `UnusedDuplicate` diag struct to `rustc_attr_parsing`)

…uwer Rollup of 12 pull requests Successful merges: - #157788 (Accumulate multiple -Zsanitizer target modifiers) - #158012 (Stabilize `strip_circumfix`) - #157810 (Query the trait solver in slow path for `missing_debug_implementations`) - #157829 (tests: adapt two tests for LLVM 23 changes) - #157873 (mips: set llvm_args -mno-check-zero-division for all mips targets) - #157886 (Reject extra fields in MGCA struct const arguments) - #157917 (Don't suggest adding `in` to a `for` loop that already has one) - #157967 (Preserve track_caller for by-value dyn vtable shims) - #158019 (delegation: add simple test for incremental compilation) - #158023 (Move `UnusedDuplicate` diag struct to `rustc_attr_parsing`) - #158029 (Rename `project-stable-mir` to `project-rustc-public`) - #158044 (Add more tests for parallel frontend issues)

…uwer Rollup of 12 pull requests Successful merges: - rust-lang/rust#157788 (Accumulate multiple -Zsanitizer target modifiers) - rust-lang/rust#158012 (Stabilize `strip_circumfix`) - rust-lang/rust#157810 (Query the trait solver in slow path for `missing_debug_implementations`) - rust-lang/rust#157829 (tests: adapt two tests for LLVM 23 changes) - rust-lang/rust#157873 (mips: set llvm_args -mno-check-zero-division for all mips targets) - rust-lang/rust#157886 (Reject extra fields in MGCA struct const arguments) - rust-lang/rust#157917 (Don't suggest adding `in` to a `for` loop that already has one) - rust-lang/rust#157967 (Preserve track_caller for by-value dyn vtable shims) - rust-lang/rust#158019 (delegation: add simple test for incremental compilation) - rust-lang/rust#158023 (Move `UnusedDuplicate` diag struct to `rustc_attr_parsing`) - rust-lang/rust#158029 (Rename `project-stable-mir` to `project-rustc-public`) - rust-lang/rust#158044 (Add more tests for parallel frontend issues)

rustbot added PG-exploit-mitigations Project group: Exploit mitigations S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 11, 2026

rustbot assigned petrochenkov Jun 11, 2026

This comment has been minimized.

Sign in to view

rustbot added has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 11, 2026

PiJoules force-pushed the multiple-sanitizer-flags branch from 17905c2 to fe9caed Compare June 11, 2026 20:33

This comment has been minimized.

Sign in to view

rustbot removed has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 11, 2026

PiJoules force-pushed the multiple-sanitizer-flags branch 2 times, most recently from b1fec2d to 0dcc9d6 Compare June 11, 2026 20:48

This comment has been minimized.

Sign in to view

PiJoules force-pushed the multiple-sanitizer-flags branch from 0dcc9d6 to 76f555b Compare June 11, 2026 20:59

rustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. F-autodiff `#![feature(autodiff)]` labels Jun 11, 2026

This comment has been minimized.

Sign in to view

PiJoules force-pushed the multiple-sanitizer-flags branch from 76f555b to 1148afe Compare June 11, 2026 21:00

petrochenkov reviewed Jun 15, 2026

View reviewed changes

Comment thread compiler/rustc_session/src/options.rs Outdated

petrochenkov reviewed Jun 15, 2026

View reviewed changes

Comment thread tests/codegen-llvm/sanitizer/multiple-sanitizers.rs

petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 15, 2026

rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 16, 2026

JonathanBrouwer mentioned this pull request Jun 16, 2026

Rollup of 9 pull requests #157963

Closed

rust-bors Bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 16, 2026

PiJoules force-pushed the multiple-sanitizer-flags branch from dad6583 to 115338b Compare June 16, 2026 18:07

rust-bors Bot pushed a commit that referenced this pull request Jun 17, 2026

Auto merge of #157788 - PiJoules:multiple-sanitizer-flags, r=<try>

3de26f1

Accumulate multiple -Zsanitizer target modifiers try-job: test-various

This comment has been minimized.

Sign in to view

rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 17, 2026

JonathanBrouwer mentioned this pull request Jun 17, 2026

Rollup of 8 pull requests #158027

Closed

JonathanBrouwer mentioned this pull request Jun 17, 2026

Rollup of 12 pull requests #158047

Merged

rust-bors Bot merged commit 47ce0db into rust-lang:main Jun 18, 2026
14 checks passed

rustbot added this to the 1.98.0 milestone Jun 18, 2026

Uh oh!

Conversation

PiJoules commented Jun 11, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jun 11, 2026

Uh oh!

rustbot commented Jun 11, 2026

Uh oh!

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 commented Jun 11, 2026

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

petrochenkov commented Jun 15, 2026

Uh oh!

rust-bors Bot commented Jun 16, 2026

Uh oh!

JonathanBrouwer commented Jun 16, 2026

Uh oh!

rust-bors Bot commented Jun 16, 2026

Uh oh!

PiJoules commented Jun 16, 2026

Uh oh!

petrochenkov commented Jun 17, 2026

Uh oh!

rust-bors Bot commented Jun 17, 2026

Uh oh!

petrochenkov commented Jun 17, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Jun 17, 2026

Uh oh!

petrochenkov commented Jun 17, 2026

Uh oh!

rust-bors Bot commented Jun 17, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

PiJoules commented Jun 11, 2026 •

edited by rustbot

Loading