Stop needing an alloca for `catch_unwind` by scottmcm · Pull Request #156867 · rust-lang/rust

scottmcm · 2026-05-24T03:07:44Z

Turns out these were all making OperandValue::Immediates already -- the intrinsic always returns a primitive scalar -- so pretty easy to handle.

cc #153250 rust-lang/compiler-team#970

While I was looking at it, I also "rustified" the intrinsic signature a bit: returning a bool and taking a generic pointee and unsafe fns cleans up the call in std a bit without making the implementation in the backend any harder.

r? dianqk

rustbot · 2026-05-24T03:07:48Z

The GCC codegen subtree was changed

cc @antoyo, @GuillaumeGomez

The Cranelift subtree was changed

cc @bjorn3

Some changes occurred to the intrinsics. Make sure the CTFE / Miri interpreter
gets adapted for the changes, if necessary.

cc @rust-lang/miri, @RalfJung, @oli-obk, @lcnr

rustbot · 2026-05-24T06:19:00Z

The Miri subtree was changed

cc @rust-lang/miri

dianqk

LGTM except for std. I don't know how to review a nightly public API change.

View changes since this review

dianqk · 2026-05-26T05:23:25Z

r? libs

joboet · 2026-05-28T13:23:20Z

I think that intrinsics are considered private implementation details, not public API, so this doesn't need any special approval.

@bors r=@dianqk
r? @dianqk

rust-bors · 2026-05-28T13:23:24Z

📌 Commit 6adeeb5 has been approved by dianqk

It is now in the queue for this repository.

rust-bors · 2026-05-28T18:45:38Z

💔 Test for d5e693f failed: CI. Failed job:

try - test-various (web logs, enhanced plaintext logs)

Turns out these were all making `OperandValue::Immediate`s already -- the intrinsic always returns a primitive scalar -- so pretty easy to handle. While I was looking at it, I also "rustified" the intrinsic signature a bit: returning a `bool` and taking a generic pointee and `unsafe fn`s cleans up the call in `std` a bit without making the implementation in the backend any harder.

scottmcm · 2026-05-29T02:56:26Z

@bors try jobs=test-various

Stop needing an alloca for `catch_unwind` try-job: test-various

rust-bors · 2026-05-29T05:17:59Z

☀️ Try build successful (CI)
Build commit: 19917ba (19917ba4918b73f0256f72eaa148e1ae021eaf23, parent: cced03bfd61a304243a34504618ecec86c17063f)

scottmcm · 2026-05-29T05:18:16Z

@bors r=@dianqk

rust-bors · 2026-05-29T05:18:19Z

📌 Commit 6aa9c03 has been approved by dianqk

It is now in the queue for this repository.

…uwer Rollup of 12 pull requests Successful merges: - #156867 (Stop needing an alloca for `catch_unwind`) - #157050 (Couple of changes to help with moving LTO to the link phase) - #148345 (add inline to copy_within) - #156931 (Add splitting caveats to `{read,write}_volatile`) - #156980 (Add frame pointer annotations to the module) - #156991 ([AIX] Sync compiler and std with libc changes) - #157008 (Avoid some symbol interning) - #157038 (android: implement file locking by calling flock) - #157071 (Fix `cfg` typo in rustdoc book) - #157080 (Fix typo in Rustdoc release notes) - #157084 (Clean up error reporting for impl Drop enum casts) - #157091 (Remove minicore ping for myself)

rust-bors · 2026-05-29T08:58:55Z

⌛ Testing commit 6aa9c03 with merge a670fe9...

Workflow: https://github.com/rust-lang/rust/actions/runs/26628198475

…anqk Stop needing an alloca for `catch_unwind` Turns out these were all making `OperandValue::Immediate`s already -- the intrinsic always returns a primitive scalar -- so pretty easy to handle. cc #153250 rust-lang/compiler-team#970 While I was looking at it, I also "rustified" the intrinsic signature a bit: returning a `bool` and taking a generic pointee and `unsafe fn`s cleans up the call in `std` a bit without making the implementation in the backend any harder. r? dianqk

JonathanBrouwer · 2026-05-29T09:03:44Z

@bors yield
Yielding to enclosing rollup

rust-bors · 2026-05-29T09:03:49Z

Auto build was cancelled. Cancelled workflows:

https://github.com/rust-lang/rust/actions/runs/26628198475

The next pull request likely to be tested is #157072.

…uwer Rollup of 12 pull requests Successful merges: - #156867 (Stop needing an alloca for `catch_unwind`) - #157050 (Couple of changes to help with moving LTO to the link phase) - #148345 (add inline to copy_within) - #156931 (Add splitting caveats to `{read,write}_volatile`) - #156980 (Add frame pointer annotations to the module) - #156991 ([AIX] Sync compiler and std with libc changes) - #157008 (Avoid some symbol interning) - #157038 (android: implement file locking by calling flock) - #157071 (Fix `cfg` typo in rustdoc book) - #157080 (Fix typo in Rustdoc release notes) - #157084 (Clean up error reporting for impl Drop enum casts) - #157091 (Remove minicore ping for myself)

Rollup merge of #156867 - scottmcm:WIP-no-alloca-for-catch-unwind, r=dianqk Stop needing an alloca for `catch_unwind` Turns out these were all making `OperandValue::Immediate`s already -- the intrinsic always returns a primitive scalar -- so pretty easy to handle. cc #153250 rust-lang/compiler-team#970 While I was looking at it, I also "rustified" the intrinsic signature a bit: returning a `bool` and taking a generic pointee and `unsafe fn`s cleans up the call in `std` a bit without making the implementation in the backend any harder. r? dianqk

…uwer Rollup of 12 pull requests Successful merges: - rust-lang/rust#156867 (Stop needing an alloca for `catch_unwind`) - rust-lang/rust#157050 (Couple of changes to help with moving LTO to the link phase) - rust-lang/rust#148345 (add inline to copy_within) - rust-lang/rust#156931 (Add splitting caveats to `{read,write}_volatile`) - rust-lang/rust#156980 (Add frame pointer annotations to the module) - rust-lang/rust#156991 ([AIX] Sync compiler and std with libc changes) - rust-lang/rust#157008 (Avoid some symbol interning) - rust-lang/rust#157038 (android: implement file locking by calling flock) - rust-lang/rust#157071 (Fix `cfg` typo in rustdoc book) - rust-lang/rust#157080 (Fix typo in Rustdoc release notes) - rust-lang/rust#157084 (Clean up error reporting for impl Drop enum casts) - rust-lang/rust#157091 (Remove minicore ping for myself)

See rust-lang/rust#156867.

…nwind, r=dianqk Stop needing an alloca for `catch_unwind` Turns out these were all making `OperandValue::Immediate`s already -- the intrinsic always returns a primitive scalar -- so pretty easy to handle. cc rust-lang#153250 rust-lang/compiler-team#970 While I was looking at it, I also "rustified" the intrinsic signature a bit: returning a `bool` and taking a generic pointee and `unsafe fn`s cleans up the call in `std` a bit without making the implementation in the backend any harder. r? dianqk

rustbot assigned dianqk May 24, 2026

This comment has been minimized.

Sign in to view

scottmcm force-pushed the WIP-no-alloca-for-catch-unwind branch from 2a1bb44 to 13ccf4f Compare May 24, 2026 04:41

This comment has been minimized.

Sign in to view

scottmcm force-pushed the WIP-no-alloca-for-catch-unwind branch from 13ccf4f to 31eb9f4 Compare May 24, 2026 06:18

This comment has been minimized.

Sign in to view

scottmcm force-pushed the WIP-no-alloca-for-catch-unwind branch from 31eb9f4 to 6adeeb5 Compare May 24, 2026 07:20

This comment was marked as resolved.

Sign in to view

scottmcm closed this May 24, 2026

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 24, 2026

scottmcm reopened this May 24, 2026

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 24, 2026

dianqk approved these changes May 26, 2026

View reviewed changes

This comment was marked as outdated.

Sign in to view

rustbot assigned Mark-Simulacrum and unassigned dianqk May 26, 2026

rustbot assigned dianqk May 28, 2026

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 May 28, 2026

rustbot unassigned Mark-Simulacrum May 28, 2026

rust-bors Bot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 28, 2026

This comment has been minimized.

Sign in to view

scottmcm force-pushed the WIP-no-alloca-for-catch-unwind branch from 6adeeb5 to 6aa9c03 Compare May 29, 2026 02:54

This comment has been minimized.

Sign in to view

rust-bors Bot pushed a commit that referenced this pull request May 29, 2026

Auto merge of #156867 - scottmcm:WIP-no-alloca-for-catch-unwind, r=<try>

19917ba

Stop needing an alloca for `catch_unwind` try-job: test-various

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 May 29, 2026

JonathanBrouwer mentioned this pull request May 29, 2026

Rollup of 12 pull requests #157095

Merged

rust-bors Bot merged commit 0f27774 into rust-lang:main May 29, 2026
13 of 14 checks passed

rustbot added this to the 1.98.0 milestone May 29, 2026

scottmcm deleted the WIP-no-alloca-for-catch-unwind branch May 29, 2026 16:47

taiki-e mentioned this pull request May 30, 2026

Fix build error due to core::intrinsics::catch_unwind return type change nbdd0121/unwinding#58

Merged

This was referenced May 31, 2026

PSP fails to compile on nightly after 2026-05-29 overdrivenpotato/rust-psp#197

Open

fix: update catch_unwind intrinsic call for bool return type overdrivenpotato/rust-psp#198

Open

purplesyringa added a commit to iex-rs/lithium that referenced this pull request May 31, 2026

Update to new catch_unwind signature

cbdf9aa

See rust-lang/rust#156867.

rust-timer mentioned this pull request Jun 7, 2026

Rollup of 25 pull requests #157558

Merged

Uh oh!

Conversation

scottmcm commented May 24, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented May 24, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

rustbot commented May 24, 2026

Uh oh!

This comment has been minimized.

This comment was marked as resolved.

dianqk left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

This comment was marked as outdated.

This comment was marked as outdated.

dianqk commented May 26, 2026

Uh oh!

joboet commented May 28, 2026

Uh oh!

rust-bors Bot commented May 28, 2026

Uh oh!

rust-bors Bot commented May 28, 2026

Uh oh!

This comment has been minimized.

scottmcm commented May 29, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented May 29, 2026

Uh oh!

scottmcm commented May 29, 2026

Uh oh!

rust-bors Bot commented May 29, 2026

Uh oh!

rust-bors Bot commented May 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JonathanBrouwer commented May 29, 2026

Uh oh!

rust-bors Bot commented May 29, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

scottmcm commented May 24, 2026 •

edited by rustbot

Loading

dianqk left a comment •

edited by rustbot

Loading

rust-bors Bot commented May 29, 2026 •

edited

Loading