Share _Unwind_Exception definition between native and wasm by bjorn3 · Pull Request #159785 · rust-lang/rust

bjorn3 · 2026-07-23T17:37:06Z

And a couple of minor cleanups.

Follow up to #159010

rustbot · 2026-07-23T17:37:11Z

rustbot has assigned @clarfonthey.
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: @ChrisDenton, libs
@ChrisDenton, libs expanded to 13 candidates
Random selection from 6 candidates

The wasm case below already handles this for us.

rustbot · 2026-07-24T09:34:06Z

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.

clarfonthey · 2026-07-25T14:12:04Z

Changes like this make me wish that git's move detection weren't so horrendous. It looks okay though.

@bors r+ rollup=iffy

Target-specific code with target-specific consequences, not all tests run in PR CI.

rust-bors · 2026-07-25T14:12:07Z

📌 Commit 0ccc68e has been approved by clarfonthey

It is now in the queue for this repository.

Share _Unwind_Exception definition between native and wasm And a couple of minor cleanups. Follow up to #159010

bjorn3 · 2026-07-25T14:25:44Z

Locally you can use git show --color-moved. Github doesn't expose that unfortunately.

rust-bors · 2026-07-25T14:25:46Z

💔 Test for a86cdff failed: CI. Failed job:

auto - dist-ohos-x86_64 (web logs, enhanced plaintext logs)

bjorn3 · 2026-07-25T14:28:13Z

@bors retry failed to connect to dockerhub

clarfonthey · 2026-07-25T14:29:49Z

Side note: this failed because Actions is still broken, I think, and it wasn't supposed to be automatically merged anyway.

Will try to add as "normal" rollup and hopefully it doesn't auto-queue:

@bors r+ rollup=maybe Target-specific code with target-specific consequences, not all tests run in PR CI.

rust-bors · 2026-07-25T14:29:51Z

📌 Commit 0ccc68e has been approved by clarfonthey

It is now in the queue for this repository.

…they Share _Unwind_Exception definition between native and wasm And a couple of minor cleanups. Follow up to rust-lang#159010

…uwer Rollup of 25 pull requests Successful merges: - #138618 (Support using const pointers in asm `const` operand) - #157962 (Lower paths to functions in const args as ConstKind::Error) - #158404 (trait_solver: normalize next-gen region constraints) - #158709 (rustdoc: warn on improperly interleaved HTML/MD) - #159174 (Fix implicit_provenance_casts warnings on Xous) - #159179 (enable `unreachable_cfg_select_predicates` lint as part of `unused` lint group) - #159518 (iter: extend step_by specialization to cover StepBy<RangeIter<{integer}>>) - #159673 (bootstrap: forward -fdebug-prefix-map when using cc) - #159700 (Split non-local `semicolon_in_expressions_from_macros` into a separate lint) - #159720 (document #[global_allocator] constraints) - #159732 (optimization: don't look for diagnostic/canonical items without rustc_attrs enabled) - #159738 (implement `CovariantUnsafeCell`) - #159740 (reuse regular exported_non_generic_symbols logic in Miri) - #159780 (check `extern "custom"` function pointers) - #159785 (Share _Unwind_Exception definition between native and wasm) - #159786 (rustdoc-js: ignore editor temp files in test folder discovery) - #159819 (std::sync::poison: disable auto_cfg on PoisonError::new) - #155388 (stepping into where-clauses during normalization may be productive) - #155914 (when bailing on ambiguity, don't force other results to ambig) - #159204 (Add support to caller_location to rustc_public) - #159439 (Fix(lib/fs/win): Fall back on Win32 delete for `Dir::remove_file`) - #159676 (Update wasm-component-ld to 0.5.27) - #159695 (proc_macro: Fix cfg_attr inner attrs in file modules) - #159730 (allow accessing the contents of UnsafeCell without going through get) - #159809 (Avoid `#[target_features]`)

tmiasko · 2026-07-25T21:00:06Z

            unsafe {
                *ip_before_insn = 0;
-                _Unwind_GetIP(ctx)
+                let val = unsafe { _Unwind_GetGR(ctx, UNWIND_IP_REG) };


warning: unnecessary `unsafe` block --> /rustc/39f1d7da58b7277d3ac42f851507082654e56a2e/library/unwind/src/libunwind.rs:170:27 | 168 | unsafe { | ------ because it's nested under this `unsafe` block 169 | *ip_before_insn = 0; 170 | let val = unsafe { _Unwind_GetGR(ctx, UNWIND_IP_REG) }; | ^^^^^^ unnecessary `unsafe` block

View changes since the review

tmiasko · 2026-07-25T21:01:24Z

@bors r-

rust-bors · 2026-07-25T21:01:30Z

This pull request was unapproved.

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

View changes since this unapproval

bjorn3 · 2026-07-27T09:38:43Z

@bors try jobs=dist-various-1

Share _Unwind_Exception definition between native and wasm try-job: dist-various-1

rust-bors · 2026-07-27T11:16:30Z

☀️ Try build successful (CI)
Build commit: 0b95c50 (0b95c50a0883f49f58a8e3104edb57e853598af8)
Base parent: dfbea5b (dfbea5bc945a9d7ff017d3d4bfbd1af9295fe5b8)

clarfonthey · 2026-07-27T11:27:57Z

@bors r+ rollup

rust-bors · 2026-07-27T11:28:00Z

📌 Commit 3265681 has been approved by clarfonthey

It is now in the queue for this repository.

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

Reason for tree closure: spurious failures

…uwer Rollup of 14 pull requests Successful merges: - #160009 (`rust-analyzer` subtree update) - #159833 (ci: Make the `x86_64-gnu-parallel-frontend` job non-optional) - #158873 (applying `/Brepro` in bootstrap on MSVC and adding a run-make test.) - #159777 (Enforce that we don't generate code for comptime fns) - #159997 (On many bindings with move error, limit the number of `Span`s) - #158205 (fix: defer const normalize in coherence mode) - #159312 (Windows implementation for stdio set/take/replace) - #159772 (Fix lowering of resolved const inference variables) - #159785 (Share _Unwind_Exception definition between native and wasm) - #159968 (Fix the const impl suggestion) - #159974 (Update thinvec to 0.2.19) - #160013 (tests/ui: Ignore one query cycle test in parallel frontend mode) - #160016 (compiletest: do not talk about JSON when the user never sees any) - #160018 (test suite: add ARM case to ABI-required target feature check for -Ctarget-cpu)

Rollup merge of #159785 - bjorn3:refactor_unwind2, r=clarfonthey Share _Unwind_Exception definition between native and wasm And a couple of minor cleanups. Follow up to #159010

rustbot assigned clarfonthey Jul 23, 2026

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jul 23, 2026

This comment has been minimized.

Sign in to view

bjorn3 force-pushed the refactor_unwind2 branch from c271052 to 6b0f51b Compare July 23, 2026 19:38

This comment has been minimized.

Sign in to view

Nikolay-Sitnikov reviewed Jul 23, 2026

View reviewed changes

Comment thread library/unwind/src/types.rs Outdated

bjorn3 added 3 commits July 24, 2026 11:29

Introduce types module for types shared between libunwind and wasm

5951005

Remove a cfg_select! where the api doesn't change

46b319e

Remove aborting Emscripten personality function

f5260df

The wasm case below already handles this for us.

bjorn3 force-pushed the refactor_unwind2 branch from 6b0f51b to f5260df Compare July 24, 2026 09:34

Remove a bunch of unused bindings from the unwind crate

0ccc68e

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 Jul 25, 2026

This comment has been minimized.

Sign in to view

rust-bors Bot pushed a commit that referenced this pull request Jul 25, 2026

Auto merge of #159785 - bjorn3:refactor_unwind2, r=clarfonthey

a86cdff

Share _Unwind_Exception definition between native and wasm And a couple of minor cleanups. Follow up to #159010

rust-bors Bot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 25, 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 Jul 25, 2026

This comment has been minimized.

Sign in to view

JonathanBrouwer mentioned this pull request Jul 25, 2026

Rollup of 25 pull requests #159920

Closed

tmiasko reviewed Jul 25, 2026

View reviewed changes

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 Jul 25, 2026

Fix lint warning

3265681

This comment has been minimized.

Sign in to view

rust-bors Bot pushed a commit that referenced this pull request Jul 27, 2026

Auto merge of #159785 - bjorn3:refactor_unwind2, r=<try>

0b95c50

Share _Unwind_Exception definition between native and wasm try-job: dist-various-1

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 Jul 27, 2026

JonathanBrouwer mentioned this pull request Jul 27, 2026

Rollup of 14 pull requests #160021

Merged

rust-bors Bot merged commit 2a7f1d2 into rust-lang:main Jul 27, 2026
14 checks passed

rustbot added this to the 1.99.0 milestone Jul 27, 2026

rust-timer added a commit that referenced this pull request Jul 27, 2026

Unrolled build for #159785

9cc38cc

Rollup merge of #159785 - bjorn3:refactor_unwind2, r=clarfonthey Share _Unwind_Exception definition between native and wasm And a couple of minor cleanups. Follow up to #159010

bjorn3 deleted the refactor_unwind2 branch July 27, 2026 21:48

bjorn3 mentioned this pull request Jul 28, 2026

Simplify exception handling on wasm #160067

Open

Uh oh!

Uh oh!

Conversation

bjorn3 commented Jul 23, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jul 23, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

Uh oh!

rustbot commented Jul 24, 2026

Uh oh!

clarfonthey commented Jul 25, 2026

Uh oh!

rust-bors Bot commented Jul 25, 2026

Uh oh!

This comment has been minimized.

bjorn3 commented Jul 25, 2026

Uh oh!

rust-bors Bot commented Jul 25, 2026

Uh oh!

bjorn3 commented Jul 25, 2026

Uh oh!

clarfonthey commented Jul 25, 2026

Uh oh!

rust-bors Bot commented Jul 25, 2026

Uh oh!

This comment has been minimized.

tmiasko Jul 25, 2026 • 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!

tmiasko commented Jul 25, 2026

Uh oh!

rust-bors Bot commented Jul 25, 2026

Uh oh!

bjorn3 commented Jul 27, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Jul 27, 2026

Uh oh!

clarfonthey commented Jul 27, 2026

Uh oh!

rust-bors Bot commented Jul 27, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

bjorn3 commented Jul 23, 2026 •

edited by rustbot

Loading

tmiasko Jul 25, 2026 •

edited by rustbot

Loading