Skip to content

Revert enabling outline-atomics on various platforms#151896

Merged
rust-bors[bot] merged 5 commits intorust-lang:mainfrom
tgross35:revert-outline-atomics
Jan 31, 2026
Merged

Revert enabling outline-atomics on various platforms#151896
rust-bors[bot] merged 5 commits intorust-lang:mainfrom
tgross35:revert-outline-atomics

Conversation

@tgross35
Copy link
Contributor

@tgross35 tgross35 commented Jan 31, 2026 •
edited
Loading

Our implementations in compiler-builtins do not yet have BTI landing pads, so platforms using a custom-built std with unstable -Zbranch-protection=bti may run into issues. This should resolve #151486. There is a PR in progress to add BTI support to compiler-builtins 1, after which this can be re-enabled.

Linux has had outline-atomics enabled for years 2 with no known problems, so it is not changed here.

Partially reverts #144938
Reverts #149633
Zulip discussion: https://rust-lang.zulipchat.com/#narrow/channel/245100-t-compiler.2Fprioritization.2Falerts/topic/.23151486.20Chromium.20hitting.20SIGILL.20crashes.20on.20aarch64.20after.20.231.E2.80.A6/with/571170956

@rustbot rustbot added 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 Jan 31, 2026
@rustbot
Copy link
Collaborator

rustbot commented Jan 31, 2026

r? @madsmtm

rustbot has assigned @madsmtm.
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

@tgross35
Copy link
Contributor Author

tgross35 commented Jan 31, 2026

As the relevant PRs made it to beta,

@rustbot label +beta-nominated

@rustbot rustbot added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 31, 2026
@lqd
Copy link
Member

lqd commented Jan 31, 2026

The partial revert looks good to me.

r? me @bors r+

@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 31, 2026

📌 Commit 9fb68d6 has been approved by lqd

It is now in the queue for this repository.

@rust-bors rust-bors bot added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 31, 2026
@rust-bors rust-bors bot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 31, 2026
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 31, 2026
Merged
rust-bors bot pushed a commit that referenced this pull request Jan 31, 2026
@bors
Auto merge of #151897 - matthiaskrgr:rollup-eTQjYr5, r=matthiaskrgr
78865ca 
Rollup of 4 pull requests

Successful merges:

 - #151262 (Introducing clap on tidy)
 - #151896 (Revert enabling `outline-atomics` on various platforms)
 - #151849 (refactor: remove `Ty::pinned_ref` in favor of `Ty::maybe_pinned_ref`)
 - #151892 (Document enum types used as values for E0423)
@rust-bors rust-bors bot merged commit 41be336 into rust-lang:main Jan 31, 2026
11 checks passed
@rustbot rustbot added this to the 1.95.0 milestone Jan 31, 2026
rust-timer added a commit that referenced this pull request Jan 31, 2026
@rust-timer
Unrolled build for #151896
7a785b5 
Rollup merge of #151896 - tgross35:revert-outline-atomics, r=lqd

Revert enabling `outline-atomics` on various platforms

Our implementations in `compiler-builtins` do not yet have BTI landing pads, so platforms using a custom-built std with unstable `-Zbranch-protection=bti` may run into issues. This should resolve #151486. There is a PR in progress to add BTI support to compiler-builtins [1], after which this can be re-enabled.

Linux has had `outline-atomics` enabled for years [2] with no known problems, so it is not changed here.

Partially reverts #144938
Reverts #149633
Zulip discussion: https://rust-lang.zulipchat.com/#narrow/channel/245100-t-compiler.2Fprioritization.2Falerts/topic/.23151486.20Chromium.20hitting.20SIGILL.20crashes.20on.20aarch64.20after.20.231.E2.80.A6/with/571170956

[1]: rust-lang/compiler-builtins#1063
[2]: tgross35@0f9f241
@tgross35 tgross35 deleted the revert-outline-atomics branch January 31, 2026 17:05
@apiraino
Copy link
Contributor

apiraino commented Feb 5, 2026

Beta backport accepted as per compiler team on Zulip. A backport PR will be authored by the release team at the end of the current development cycle. Backport labels handled by them.

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Feb 5, 2026
@cuviper cuviper mentioned this pull request Feb 5, 2026
Open
@cuviper cuviper modified the milestones: 1.95.0, 1.94.0 Feb 5, 2026
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 5, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Feb 6, 2026
@JonathanBrouwer
Rollup merge of rust-lang#152182 - apiraino:update-compiler-stable-ba…
43ea20c 
…ckport-zulip-msg, r=jieyouxu

update compiler stable backport zulip msg

I'd like to update the message when stable backports (for t-compiler) Zulip topics are opened.

Stable backports mention the channel i.e. also people who might not have context, example:
[#t-compiler/backports > rust-lang#150590: stable-nominated @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/474880-t-compiler.2Fbackports/topic/.23150590.3A.20stable-nominated/near/569989784)

Beta backports mention author+reviewer (which fits better), example:
[#t-compiler/backports > rust-lang#151896: beta-nominated @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/474880-t-compiler.2Fbackports/topic/.23151896.3A.20beta-nominated/near/571171604)

This patch makes the `stable` backport opening message just like the `beta` backport one.

Thanks
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Feb 6, 2026
@JonathanBrouwer
Rollup merge of rust-lang#152182 - apiraino:update-compiler-stable-ba…
d26021a 
…ckport-zulip-msg, r=jieyouxu

update compiler stable backport zulip msg

I'd like to update the message when stable backports (for t-compiler) Zulip topics are opened.

Stable backports mention the channel i.e. also people who might not have context, example:
[#t-compiler/backports > rust-lang#150590: stable-nominated @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/474880-t-compiler.2Fbackports/topic/.23150590.3A.20stable-nominated/near/569989784)

Beta backports mention author+reviewer (which fits better), example:
[#t-compiler/backports > rust-lang#151896: beta-nominated @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/474880-t-compiler.2Fbackports/topic/.23151896.3A.20beta-nominated/near/571171604)

This patch makes the `stable` backport opening message just like the `beta` backport one.

Thanks
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Feb 6, 2026
@JonathanBrouwer
Rollup merge of rust-lang#152182 - apiraino:update-compiler-stable-ba…
6db1e09 
…ckport-zulip-msg, r=jieyouxu

update compiler stable backport zulip msg

I'd like to update the message when stable backports (for t-compiler) Zulip topics are opened.

Stable backports mention the channel i.e. also people who might not have context, example:
[#t-compiler/backports > rust-lang#150590: stable-nominated @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/474880-t-compiler.2Fbackports/topic/.23150590.3A.20stable-nominated/near/569989784)

Beta backports mention author+reviewer (which fits better), example:
[#t-compiler/backports > rust-lang#151896: beta-nominated @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/474880-t-compiler.2Fbackports/topic/.23151896.3A.20beta-nominated/near/571171604)

This patch makes the `stable` backport opening message just like the `beta` backport one.

Thanks
rust-timer added a commit that referenced this pull request Feb 6, 2026
@rust-timer
Unrolled build for #152182
93cdca7 
Rollup merge of #152182 - apiraino:update-compiler-stable-backport-zulip-msg, r=jieyouxu

update compiler stable backport zulip msg

I'd like to update the message when stable backports (for t-compiler) Zulip topics are opened.

Stable backports mention the channel i.e. also people who might not have context, example:
[#t-compiler/backports > #150590: stable-nominated @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/474880-t-compiler.2Fbackports/topic/.23150590.3A.20stable-nominated/near/569989784)

Beta backports mention author+reviewer (which fits better), example:
[#t-compiler/backports > #151896: beta-nominated @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/474880-t-compiler.2Fbackports/topic/.23151896.3A.20beta-nominated/near/571171604)

This patch makes the `stable` backport opening message just like the `beta` backport one.

Thanks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@lqd lqd

Labels

beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.94.0

Development

Successfully merging this pull request may close these issues.

Chromium hitting SIGILL crashes on aarch64 after #144938 enabled outlined atomics by default

6 participants

@tgross35 @rustbot @lqd @apiraino @cuviper @madsmtm