[win] Fix truncated unwinds for Arm64 Windows#153202
Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom Mar 8, 2026
Merged
[win] Fix truncated unwinds for Arm64 Windows#153202rust-bors[bot] merged 1 commit intorust-lang:mainfrom
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
Conversation
Collaborator
|
r? @cuviper rustbot has assigned @cuviper. Use Why was this reviewer chosen?The reviewer was selected based on:
|
cuviper
approved these changes
Mar 7, 2026
Member
There was a problem hiding this comment.
I still wonder why we don't subtract 1 in backtrace-rs, as suggested in the issue, but I guess this change is still fine if other unwinders need it.
@bors r+
| @@ -347,7 +347,13 @@ extern "C" LLVMTargetMachineRef LLVMRustCreateTargetMachine( | |||
| // option causes bugs in the LLVM WebAssembly backend. You should be able to | |||
| // remove this check when Rust's minimum supported LLVM version is >= 18 | |||
Member
There was a problem hiding this comment.
I suppose we could try wasm again now, but not in this PR of course...
Contributor
jhpratt
added a commit
to jhpratt/rust
that referenced
this pull request
Mar 7, 2026
[win] Fix truncated unwinds for Arm64 Windows Panic backtraces on ARM64 Windows are truncated because Rust's LLVM configuration sets `NoTrapAfterNoreturn = true`, which suppresses the generation of `brk #0x1` (trap) instructions after calls to `noreturn` functions. Without this trap instruction, the return address from a `noreturn` call points past the end of the calling function into an unrelated function, causing `RtlLookupFunctionEntry` to return the wrong unwind information, which terminates the stack walk prematurely. In general, `NoTrapAfterNoreturn = true` is recommended against for Windows, since we have seen security vulnerabilities in the past where an attacker has managed to return from a noreturn function, or the function wasn't actually noereturn, resulting in executing whatever was after the call. This change disables setting `NoTrapAfterNoreturn = true` for Windows. Fixes rust-lang#140489
rust-bors bot
pushed a commit
that referenced
this pull request
Mar 8, 2026
Rollup of 4 pull requests Successful merges: - #153202 ([win] Fix truncated unwinds for Arm64 Windows) - #153437 (coretest in miri: fix using unstable libtest features) - #153446 (Always use the ThinLTO pipeline for pre-link optimizations) - #153548 (add test for closure precedence in `TokenStream`s)
rust-timer
added a commit
that referenced
this pull request
Mar 8, 2026
Rollup merge of #153202 - dpaoliello:arm64unwind, r=cuviper [win] Fix truncated unwinds for Arm64 Windows Panic backtraces on ARM64 Windows are truncated because Rust's LLVM configuration sets `NoTrapAfterNoreturn = true`, which suppresses the generation of `brk #0x1` (trap) instructions after calls to `noreturn` functions. Without this trap instruction, the return address from a `noreturn` call points past the end of the calling function into an unrelated function, causing `RtlLookupFunctionEntry` to return the wrong unwind information, which terminates the stack walk prematurely. In general, `NoTrapAfterNoreturn = true` is recommended against for Windows, since we have seen security vulnerabilities in the past where an attacker has managed to return from a noreturn function, or the function wasn't actually noereturn, resulting in executing whatever was after the call. This change disables setting `NoTrapAfterNoreturn = true` for Windows. Fixes #140489
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Panic backtraces on ARM64 Windows are truncated because Rust's LLVM configuration sets
NoTrapAfterNoreturn = true, which suppresses the generation ofbrk #0x1(trap) instructions after calls tonoreturnfunctions. Without this trap instruction, the return address from anoreturncall points past the end of the calling function into an unrelated function, causingRtlLookupFunctionEntryto return the wrong unwind information, which terminates the stack walk prematurely.In general,
NoTrapAfterNoreturn = trueis recommended against for Windows, since we have seen security vulnerabilities in the past where an attacker has managed to return from a noreturn function, or the function wasn't actually noereturn, resulting in executing whatever was after the call.This change disables setting
NoTrapAfterNoreturn = truefor Windows.Fixes #140489