Fix: On wasm targets, call `panic_in_cleanup` if panic occurs in cleanup by hoodmane · Pull Request #155249 · rust-lang/rust

hoodmane · 2026-04-13T17:25:11Z

Relies on rust-lang/llvm-project#194.
Reland of #151771.

Previously this was not correctly implemented. Each funclet may need its own terminate block, so this changes the terminate_block into a terminate_blocks IndexVec which can have a terminate_block for each funclet. We key on the first basic block of the funclet -- in particular, this is the start block for the old case of the top level terminate function.

Rather than using a catchswitch/catchpad pair, I used a cleanuppad. The reason for the pair is to avoid catching foreign exceptions on MSVC. On wasm, it seems that the catchswitch/catchpad pair is optimized back into a single cleanuppad and a catch_all instruction is emitted which will catch foreign exceptions. Because the new logic is only used on wasm, it seemed better to take the simpler approach seeing as they do the same thing.

Add test for Complex EH flow miscompiled on wasm #153948

rustbot · 2026-04-13T17:25:16Z

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo, @GuillaumeGomez

rustbot · 2026-04-13T17:25:19Z

r? @JohnTitor

rustbot has assigned @JohnTitor.
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: codegen, compiler
codegen, compiler expanded to 69 candidates
Random selection from 13 candidates

hoodmane · 2026-04-13T17:55:12Z

r? @bjorn3

bjorn3 · 2026-04-13T18:01:51Z

@rustbot blocked LLVM backport and rustc LLVM update need to land first.

Update LLVM to 22.1.4 Unlocks #155249. I made a new branch that removes CI checks for macOS and reverts rust-lang/llvm-project@24b53fb.

Update LLVM to 22.1.4 Unlocks rust-lang/rust#155249. I made a new branch that removes CI checks for macOS and reverts rust-lang/llvm-project@24b53fb.

mati865 · 2026-04-28T16:41:27Z

@bors author

The backport has happened.

rust-bors · 2026-04-28T16:41:31Z

Unknown command "author". Run @bors help to see available commands.

mati865 · 2026-04-28T16:42:22Z

@rustbot author

rustbot · 2026-04-28T16:42:26Z

Reminder, once the PR becomes ready for a review, use @rustbot ready.

Previously this was not correctly implemented. Each funclet may need its own terminate block, so this changes the `terminate_block` into a `terminate_blocks` `IndexVec` which can have a terminate_block for each funclet. We key on the first basic block of the funclet -- in particular, this is the start block for the old case of the top level terminate function. Rather than using a catchswitch/catchpad pair, I used a cleanuppad. The reason for the pair is to avoid catching foreign exceptions on MSVC. On wasm, it seems that the catchswitch/catchpad pair is optimized back into a single cleanuppad and a catch_all instruction is emitted which will catch foreign exceptions. Because the new logic is only used on wasm, it seemed better to take the simpler approach seeing as they do the same thing.

rustbot · 2026-04-28T16:56:33Z

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.

hoodmane · 2026-04-28T19:02:55Z

@rustbot ready

Update LLVM to 22.1.4 Unlocks rust-lang/rust#155249. I made a new branch that removes CI checks for macOS and reverts rust-lang/llvm-project@24b53fb.

bjorn3 · 2026-04-30T13:45:51Z

@bors r+

rust-bors · 2026-04-30T13:45:56Z

📌 Commit b072d24 has been approved by bjorn3

It is now in the queue for this repository.

…and, r=bjorn3 Fix: On wasm targets, call `panic_in_cleanup` if panic occurs in cleanup Relies on rust-lang/llvm-project#194. Reland of rust-lang#151771. Previously this was not correctly implemented. Each funclet may need its own terminate block, so this changes the `terminate_block` into a `terminate_blocks` `IndexVec` which can have a terminate_block for each funclet. We key on the first basic block of the funclet -- in particular, this is the start block for the old case of the top level terminate function. Rather than using a catchswitch/catchpad pair, I used a cleanuppad. The reason for the pair is to avoid catching foreign exceptions on MSVC. On wasm, it seems that the catchswitch/catchpad pair is optimized back into a single cleanuppad and a catch_all instruction is emitted which will catch foreign exceptions. Because the new logic is only used on wasm, it seemed better to take the simpler approach seeing as they do the same thing. - [ ] Add test for rust-lang#153948

…uwer Rollup of 13 pull requests Successful merges: - #155249 (Fix: On wasm targets, call `panic_in_cleanup` if panic occurs in cleanup) - #155853 (Use `_mcount` as the mcount symbol name on RISC-V Linux GNU targets) - #155919 (simplify `ast_fragments!`) - #155939 (Add feature gate for view_types experiment) - #155974 (add `c_variadic_experimental_arch` feature) - #155991 (Catch unwinds from the global ctxt callback to complete queries profiling data in more cases) - #156003 (Pass Session to optimize_and_codegen_fat_lto) - #153566 (Add suggestion for E0401 on inner const items) - #154610 (Suggest public re-exports when a private module makes an import path inaccessible) - #155523 (Reorganize `tests/ui/issues/` - 02) - #155980 (Move `feature*` methods from `parse` mod to `errors` mod.) - #155987 (Make lifting infallible) - #155988 (tests/run-make/print-cfg: add Android target_env case)

Rollup of 19 pull requests Successful merges: - #155237 (Disentangle AST crates and error crates) - #155249 (Fix: On wasm targets, call `panic_in_cleanup` if panic occurs in cleanup) - #155853 (Use `_mcount` as the mcount symbol name on RISC-V Linux GNU targets) - #155919 (simplify `ast_fragments!`) - #155939 (Add feature gate for view_types experiment) - #155954 (rustdoc: preserve parent doc cfg for `macro_export` macros) - #155974 (add `c_variadic_experimental_arch` feature) - #155991 (Catch unwinds from the global ctxt callback to complete queries profiling data in more cases) - #156003 (Pass Session to optimize_and_codegen_fat_lto) - #153566 (Add suggestion for E0401 on inner const items) - #154610 (Suggest public re-exports when a private module makes an import path inaccessible) - #155523 (Reorganize `tests/ui/issues/` - 02) - #155821 (c-variadic: document `Clone` and `Drop` instances and require `VaArgSafe: Copy`) - #155980 (Move `feature*` methods from `parse` mod to `errors` mod.) - #155987 (Make lifting infallible) - #155988 (tests/run-make/print-cfg: add Android target_env case) - #156000 (Fix ICE when using -Zinstrument-mcount and -Clinker-flavor=lld) - #156002 (Allow to use `Diagnostic` directly in `SharedContext::emit_lint`) - #156015 (rustc-dev-guide subtree update)

Rollup merge of #155249 - hoodmane:wasm-panic-in-cleanup-reland, r=bjorn3 Fix: On wasm targets, call `panic_in_cleanup` if panic occurs in cleanup Relies on rust-lang/llvm-project#194. Reland of #151771. Previously this was not correctly implemented. Each funclet may need its own terminate block, so this changes the `terminate_block` into a `terminate_blocks` `IndexVec` which can have a terminate_block for each funclet. We key on the first basic block of the funclet -- in particular, this is the start block for the old case of the top level terminate function. Rather than using a catchswitch/catchpad pair, I used a cleanuppad. The reason for the pair is to avoid catching foreign exceptions on MSVC. On wasm, it seems that the catchswitch/catchpad pair is optimized back into a single cleanuppad and a catch_all instruction is emitted which will catch foreign exceptions. Because the new logic is only used on wasm, it seemed better to take the simpler approach seeing as they do the same thing. - [ ] Add test for #153948

rustbot assigned JohnTitor Apr 13, 2026

This comment has been minimized.

Sign in to view

hoodmane mentioned this pull request Apr 13, 2026

Backport #187484 rust-lang/llvm-project#194

Closed

rustbot assigned bjorn3 and unassigned JohnTitor Apr 13, 2026

rustbot added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 13, 2026

dianqk mentioned this pull request Apr 22, 2026

Update LLVM to 22.1.4 #155645

Merged

rust-bors Bot pushed a commit that referenced this pull request Apr 23, 2026

Auto merge of #155645 - dianqk:update-llvm, r=nikic

328de08

Update LLVM to 22.1.4 Unlocks #155249. I made a new branch that removes CI checks for macOS and reverts rust-lang/llvm-project@24b53fb.

rust-bors Bot pushed a commit that referenced this pull request Apr 24, 2026

Auto merge of #155645 - dianqk:update-llvm, r=nikic

acb65f3

Update LLVM to 22.1.4 Unlocks #155249. I made a new branch that removes CI checks for macOS and reverts rust-lang/llvm-project@24b53fb.

This comment has been minimized.

Sign in to view

rustbot removed the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Apr 28, 2026

rustbot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Apr 28, 2026

hoodmane force-pushed the wasm-panic-in-cleanup-reland branch from 9664e4c to b072d24 Compare April 28, 2026 16:56

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 28, 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 30, 2026

JonathanBrouwer mentioned this pull request Apr 30, 2026

Rollup of 13 pull requests #156010

Closed

jhpratt mentioned this pull request May 1, 2026

Rollup of 19 pull requests #156023

Merged

rust-bors Bot merged commit 0649c3f into rust-lang:main May 1, 2026
11 checks passed

rustbot added this to the 1.97.0 milestone May 1, 2026

Uh oh!

Conversation

hoodmane commented Apr 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Apr 13, 2026

Uh oh!

rustbot commented Apr 13, 2026

Uh oh!

This comment has been minimized.

hoodmane commented Apr 13, 2026

Uh oh!

bjorn3 commented Apr 13, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

mati865 commented Apr 28, 2026

Uh oh!

rust-bors Bot commented Apr 28, 2026

Uh oh!

mati865 commented Apr 28, 2026

Uh oh!

rustbot commented Apr 28, 2026

Uh oh!

rustbot commented Apr 28, 2026

Uh oh!

hoodmane commented Apr 28, 2026

Uh oh!

bjorn3 commented Apr 30, 2026

Uh oh!

rust-bors Bot commented Apr 30, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

hoodmane commented Apr 13, 2026 •

edited

Loading