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

Miri engine: proper support for Assert MIR terminators #66874

Merged
merged 9 commits into from
Dec 2, 2019

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Nov 29, 2019

This puts down the basis for rust-lang/miri#1070, and I also did some clean-up. The Miri side of this is at rust-lang/miri#1084.

r? @oli-obk

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 29, 2019
src/librustc_mir/interpret/operand.rs Outdated Show resolved Hide resolved
src/librustc_mir/interpret/place.rs Outdated Show resolved Hide resolved
src/librustc_mir/transform/const_prop.rs Show resolved Hide resolved
@RalfJung RalfJung force-pushed the miri-assert-panic branch 2 times, most recently from 24a2882 to 0b1379d Compare November 30, 2019 08:23
@rust-highfive

This comment has been minimized.

@RalfJung
Copy link
Member Author

r=me with that change

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Nov 30, 2019

📌 Commit 9e7a28b3a3f30938a4eed683d34a3cc59d61bfd9 has been approved by oli-obk

@bors
Copy link
Contributor

bors commented Nov 30, 2019

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

@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 Nov 30, 2019
@RalfJung
Copy link
Member Author

RalfJung commented Dec 1, 2019

@bors r-

@oli-obk I realized I made a mistake in my init_allocation_extra changes; I added a commit to fix that. Please check.

@bors bors 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 Dec 1, 2019
@RalfJung RalfJung added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 1, 2019
@RalfJung
Copy link
Member Author

RalfJung commented Dec 1, 2019

I rebased to be able to test this branch integrated with the Miri fixes that landed in the mean time. The last commit is the only new one.

bors added a commit that referenced this pull request Dec 1, 2019
Rollup of 7 pull requests

Successful merges:

 - #66346 (Replace .unwrap() with ? in std::os::unix::net)
 - #66789 (rustc: move mir::SourceScopeLocalData to a field of SourceScopeData.)
 - #66822 (libunwind_panic: adjust miri panic hack)
 - #66827 (handle diverging functions forwarding their return place)
 - #66828 (Less minification)
 - #66850 (rustc: hide HirId's fmt::Debug output from -Z span_free_formats.)
 - #66907 (rustc: don't just show raw DefIndex's in BrNamed's fmt::Debug impl.)

Failed merges:

 - #66874 (Miri engine: proper support for `Assert` MIR terminators)

r? @ghost
@bors
Copy link
Contributor

bors commented Dec 2, 2019

☔ The latest upstream changes (presumably #66944) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors 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 Dec 2, 2019
@RalfJung
Copy link
Member Author

RalfJung commented Dec 2, 2019

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Dec 2, 2019

📌 Commit 5e51a15 has been approved by oli-obk

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 2, 2019
@bors
Copy link
Contributor

bors commented Dec 2, 2019

⌛ Testing commit 5e51a15 with merge 2da942f...

bors added a commit that referenced this pull request Dec 2, 2019
Miri engine: proper support for `Assert` MIR terminators

This puts down the basis for rust-lang/miri#1070, and I also did some clean-up. The Miri side of this is at rust-lang/miri#1084.

r? @oli-obk
@bors
Copy link
Contributor

bors commented Dec 2, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 2, 2019
@bors bors merged commit 5e51a15 into rust-lang:master Dec 2, 2019
@RalfJung RalfJung deleted the miri-assert-panic branch December 2, 2019 15:06
bors added a commit to rust-lang/miri that referenced this pull request Dec 2, 2019
proper support for `Assert` MIR terminators

Fixes #1070
Blocked on rust-lang/rust#66874
bors added a commit to rust-lang/miri that referenced this pull request Dec 2, 2019
proper support for `Assert` MIR terminators

Fixes #1070
Blocked on rust-lang/rust#66874
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.

4 participants