Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a workaround for catch_unwind in stage1 mingw target #70010

Merged
merged 1 commit into from
Mar 16, 2020

Conversation

Amanieu
Copy link
Member

@Amanieu Amanieu commented Mar 14, 2020

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 14, 2020
@Mark-Simulacrum
Copy link
Member

@bors r+ p=1 (fixes tests on stage 1 for mingw)

@bors
Copy link
Contributor

bors commented Mar 14, 2020

📌 Commit 864d05b has been approved by Mark-Simulacrum

@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 Mar 14, 2020
@bors
Copy link
Contributor

bors commented Mar 15, 2020

⌛ Testing commit 864d05b with merge 0239cd80e7c23dc6235358a121253894cd91077d...

@bors
Copy link
Contributor

bors commented Mar 15, 2020

💥 Test timed out

@bors bors 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 Mar 15, 2020
@Amanieu
Copy link
Member Author

Amanieu commented Mar 15, 2020

@bors retry

@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 Mar 15, 2020
@bors
Copy link
Contributor

bors commented Mar 16, 2020

⌛ Testing commit 864d05b with merge 8e6de32...

// Compatibility wrapper around the try intrinsic for bootstrap.
//
// We also need to mark it #[inline(never)] to work around a bug on MinGW
// targets: the unwinding implementation was relying on UB, but this only
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there at least a brief explanation somewhere of what the UB is that it was relying on? I could not find that here nor in #70001.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Basically we were replacing LLVM's resume instruction with calls to rust_eh_unwind_resume (which then forwards to _Unwind_Resume), but it turns out that LLVM actually needs to make certain code transformations on landing pads which weren't being done since we were not using the proper resume instructions.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@bors
Copy link
Contributor

bors commented Mar 16, 2020

☀️ Test successful - checks-azure
Approved by: Mark-Simulacrum
Pushing 8e6de32 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 16, 2020
@bors bors merged commit 8e6de32 into rust-lang:master Mar 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[x86_64-pc-windows-gnu] Nightly regression: rustc hangs on multiple tests from the UI test suite
5 participants