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.

rust-log-analyzer · 2026-07-25T16:14:30Z

A job failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

…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

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

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

Uh oh!

Uh oh!

Conversation

bjorn3 commented Jul 23, 2026

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!

rust-log-analyzer commented Jul 25, 2026

Uh oh!

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!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

tmiasko Jul 25, 2026 •

edited by rustbot

Loading