Skip to content

Fix unwinding on certain platforms when debug assertions are enabled#99932

Merged
bors merged 1 commit intorust-lang:masterfrom
madsmtm:fix-unwinding-debug-assertions
Aug 1, 2022
Merged

Fix unwinding on certain platforms when debug assertions are enabled#99932
bors merged 1 commit intorust-lang:masterfrom
madsmtm:fix-unwinding-debug-assertions

Conversation

@madsmtm
Copy link
Contributor

@madsmtm madsmtm commented Jul 30, 2022 •
edited
Loading

This came up on armv7-apple-ios when using -Zbuild-std.

Looks like this is a leftover from a conversion from C to Rust, where integer wrapping is implicit.

Not at all sure how the unwinding code works!

@madsmtm
Fix unwinding when debug assertions are enabled
15b7a08 
This came up on armv7-apple-ios when using -Zbuild-std
@rust-highfive
Copy link
Contributor

rust-highfive commented Jul 30, 2022

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Mark-Simulacrum (or someone else) soon.

Please see the contribution instructions for more information.

@rustbot
Copy link
Collaborator

rustbot commented Jul 30, 2022

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@rustbot rustbot added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Jul 30, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 30, 2022
@madsmtm madsmtm mentioned this pull request Jul 30, 2022
Closed
@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Jul 30, 2022

r? @Amanieu

@Amanieu
Copy link
Member

Amanieu commented Jul 31, 2022

LGTM: ip can indeed be 0 if the root of the stack is reached and the initial function has a return address of 0.

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 31, 2022

📌 Commit 15b7a08 has been approved by Amanieu

It is now in the queue for this repository.

@bors bors 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 31, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 31, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 1, 2022
@bors
Auto merge of rust-lang#99998 - matthiaskrgr:rollup-igafy0r, r=matthi…
6423ab3 
…askrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#99519 (Remove implicit names and values from `--cfg` in `--check-cfg`)
 - rust-lang#99620 (`-Z location-detail`: provide option to disable all location details)
 - rust-lang#99932 (Fix unwinding on certain platforms when debug assertions are enabled)
 - rust-lang#99973 (Layout things)
 - rust-lang#99980 (Remove more Clean trait implementations)
 - rust-lang#99984 (Fix compat.rs for `cfg(miri)`)
 - rust-lang#99986 (Add wrap suggestions for record variants)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c98e893 into rust-lang:master Aug 1, 2022
@rustbot rustbot added this to the 1.64.0 milestone Aug 1, 2022
@madsmtm madsmtm deleted the fix-unwinding-debug-assertions branch August 1, 2022 13:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Amanieu Amanieu

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.64.0

Development

Successfully merging this pull request may close these issues.

6 participants

@madsmtm @rust-highfive @rustbot @Mark-Simulacrum @Amanieu @bors