Skip to content

adjust Miri to needs of changed unwinding strategy - #69999

Merged
bors merged 5 commits into
rust-lang:masterfrom
RalfJung:miri-unwind
Mar 14, 2020
Merged

adjust Miri to needs of changed unwinding strategy#69999
bors merged 5 commits into
rust-lang:masterfrom
RalfJung:miri-unwind

Conversation

@RalfJung

@RalfJungRalfJung commented Mar 14, 2020

Copy link
Copy Markdown
Member

As expected, #67502 broke unwinding in Miri. To fix it we have to adjust parts of the engine and the panic runtime, which this PR does. The Miri-side changes are in rust-lang/miri#1227.

Cc @oli-obk@Aaron1011@Mark-Simulacrum@Amanieu

@rust-highfive

rust-highfive commented Mar 14, 2020

Copy link
Copy Markdown
Contributor

r? @davidtwco

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 14, 2020
@RalfJung

RalfJung commented Mar 14, 2020•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

@bors p=1
because we cannot even test Miri with rustc master until this lands (so there is a risk of other breakage landing, and the more that accumulates the harder it is to fix)

@RalfJungRalfJung mentioned this pull request Mar 14, 2020
Closed
@davidtwco

davidtwco commented Mar 14, 2020

Copy link
Copy Markdown
Member

r? @oli-obk

Mark-Simulacrum
Mark-Simulacrum approved these changes Mar 14, 2020
View reviewed changes

@Mark-SimulacrumMark-Simulacrum left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Seems good, though I wasn't able to quite follow the miri changes.

Comment threadsrc/librustc/mir/interpret/value.rs Outdated

@Mark-SimulacrumMark-SimulacrumMar 14, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

These seem like they could be separate? But fine to leave them in too.

@RalfJungRalfJungMar 14, 2020

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I had to add from_i32 for the Miri side of this. So while I was at it I figured I might as well add the comments here, instead of making them a separate PR.

oli-obk
oli-obk reviewed Mar 14, 2020
View reviewed changes
Comment threadsrc/librustc_mir/interpret/eval_context.rs Outdated
@oli-obk

oli-obk commented Mar 14, 2020

Copy link
Copy Markdown
Contributor

r=me with the comment updated.

@RalfJung

RalfJung commented Mar 14, 2020

Copy link
Copy Markdown
MemberAuthor

@bors r=oli-obk

@bors

bors commented Mar 14, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit b450e1b has been approved by oli-obk

@borsbors 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
@RalfJungRalfJung mentioned this pull request Mar 14, 2020
Merged
@bors

bors commented Mar 14, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b450e1b with merge 7cdbc87...

@bors

bors commented Mar 14, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: oli-obk
Pushing 7cdbc87 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Mar 14, 2020
@bors
bors merged commit 7cdbc87 into rust-lang:masterMar 14, 2020
@RalfJung
RalfJung deleted the miri-unwind branch March 15, 2020 10:50
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oli-obkoli-obkoli-obk left review comments
@Mark-SimulacrumMark-SimulacrumMark-Simulacrum approved these changes

Assignees

@oli-obkoli-obk

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@RalfJung@rust-highfive@davidtwco@oli-obk@bors@Mark-Simulacrum