Miri engine: proper support for Assert MIR terminators#66874
Merged
bors merged 9 commits intorust-lang:masterfrom Dec 2, 2019
Merged
Miri engine: proper support for Assert MIR terminators#66874bors merged 9 commits intorust-lang:masterfrom
Assert MIR terminators#66874bors merged 9 commits intorust-lang:masterfrom
Conversation
rust-highfive
added
the
S-waiting-on-review
oli-obk
requested changes
Nov 30, 2019
RalfJung
force-pushed
the
miri-assert-panic
branch
2 times, most recently
from
24a2882 to
0b1379d
Compare
This comment has been minimized.
This comment has been minimized.
RalfJung
force-pushed
the
miri-assert-panic
branch
from
0b1379d to
a83aa9b
Compare
4 tasks
Member
Author
@bors r=oli-obk |
Collaborator
|
📌 Commit 9e7a28b3a3f30938a4eed683d34a3cc59d61bfd9 has been approved by |
Collaborator
|
🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened |
bors
added
S-waiting-on-bors
Member
Author
bors
added
S-waiting-on-author
RalfJung
added
S-waiting-on-review
RalfJung
force-pushed
the
miri-assert-panic
branch
from
04a4b85 to
3c1fd05
Compare
Member
Author
|
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
Collaborator
|
☔ The latest upstream changes (presumably #66944) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
RalfJung
force-pushed
the
miri-assert-panic
branch
from
3c1fd05 to
5e51a15
Compare
Member
Author
|
@bors r=oli-obk |
Collaborator
|
📌 Commit 5e51a15 has been approved by |
bors
added
S-waiting-on-bors
Collaborator
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
Collaborator
|
☀️ Test successful - checks-azure |
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
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
4 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.
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