Miri engine: proper support for `Assert` MIR terminators by RalfJung · Pull Request #66874 · rust-lang/rust

RalfJung · 2019-11-29T19:20:58Z

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

RalfJung · 2019-11-30T13:33:49Z

r=me with that change

@bors r=oli-obk

bors · 2019-11-30T13:33:51Z

📌 Commit 9e7a28b3a3f30938a4eed683d34a3cc59d61bfd9 has been approved by oli-obk

bors · 2019-11-30T13:33:52Z

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

RalfJung · 2019-12-01T09:46:55Z

@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.

RalfJung · 2019-12-01T11:41:16Z

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.

@ghost

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 · 2019-12-02T06:18:14Z

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

…CallerLocation

…ediate

… frame

RalfJung · 2019-12-02T08:09:17Z

@bors r=oli-obk

bors · 2019-12-02T08:09:18Z

📌 Commit 5e51a15 has been approved by oli-obk

bors · 2019-12-02T11:43:56Z

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

@oli-obk

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 · 2019-12-02T14:50:55Z

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

proper support for `Assert` MIR terminators Fixes#1070 Blocked on rust-lang/rust#66874

rust-highfive assigned oli-obk Nov 29, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 29, 2019

RalfJung mentioned this pull request Nov 29, 2019
proper support for Assert MIR terminators rust-lang/miri#1084
Merged

oli-obk requested changes Nov 30, 2019
View reviewed changes

Comment threadsrc/librustc_mir/interpret/operand.rs Outdated
Comment threadsrc/librustc_mir/interpret/place.rs Outdated
Comment threadsrc/librustc_mir/transform/const_prop.rs Outdated

RalfJung force-pushed the miri-assert-panic branch 2 times, most recently from 24a2882 to 0b1379dCompare November 30, 2019 08:23

This comment has been minimized.
Sign in to view

RalfJung force-pushed the miri-assert-panic branch from 0b1379d to a83aa9bCompare November 30, 2019 08:43

TheDarkula mentioned this pull request Nov 30, 2019
Making enums more specific in src/librustc/mir/interpret/error.rs rust-lang/const-eval#4
Closed
4 tasks

RalfJung mentioned this pull request Nov 30, 2019
ConstEval/ConstProp: get rid of Panic error kind #66902
Closed

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

Centril mentioned this pull request Dec 1, 2019
Rollup of 7 pull requests #66924
Closed

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 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 force-pushed the miri-assert-panic branch from 04a4b85 to 3c1fd05Compare December 1, 2019 11:41

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 added 9 commits December 2, 2019 08:55

Miri: add machine hook for MIR-level assertion panics
b1aa3ca

expose span to M::assert_panic, and provide helper to turn that into …
a8eea62
…CallerLocation

Add From instances for Pointer -> ScalarMaybeUndef and Pointer -> Imm…
cde17d9
…ediate

Miri: add helper fn to allocate string; simplify alloc_caller_location
56356a0

add and use helper method to get SourceInfo of current instruction in…
c8743db
… frame

make alloc_extra machine hook a bit nicer
96ea142

fat -> wide
386a2bb

Assert terminator is never executed in ConstProp
9a52543

fix init_allocation_extra
5e51a15

RalfJung force-pushed the miri-assert-panic branch from 3c1fd05 to 5e51a15Compare December 2, 2019 08:07

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 added the merged-by-bors This PR was explicitly merged by bors. label Dec 2, 2019

bors merged commit 5e51a15 into rust-lang:masterDec 2, 2019

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
Auto merge of#1084- RalfJung:assert-panic, r=RalfJung
c00b4b3
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
Auto merge of#1084- RalfJung:assert-panic, r=RalfJung
913226a
proper support for `Assert` MIR terminators Fixes#1070 Blocked on rust-lang/rust#66874

Navigation Menu

Uh oh!

Uh oh!

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

Miri engine: proper support for `Assert` MIR terminators#66874
bors merged 9 commits into
rust-lang:masterfrom
RalfJung:miri-assert-panic

RalfJung commented Nov 29, 2019•
edited
Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

RalfJung commented Nov 30, 2019

Uh oh!

bors commented Nov 30, 2019

Uh oh!

bors commented Nov 30, 2019

Uh oh!

RalfJung commented Dec 1, 2019•
edited
Loading

Uh oh!

RalfJung commented Dec 1, 2019

Uh oh!

bors commented Dec 2, 2019

Uh oh!

RalfJung commented Dec 2, 2019

Uh oh!

bors commented Dec 2, 2019

Uh oh!

bors commented Dec 2, 2019

Uh oh!

bors commented Dec 2, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Uh oh!

Conversation

RalfJung commented Nov 29, 2019• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

RalfJung commented Nov 30, 2019

Uh oh!

bors commented Nov 30, 2019

Uh oh!

bors commented Nov 30, 2019

Uh oh!

RalfJung commented Dec 1, 2019• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RalfJung commented Dec 1, 2019

Uh oh!

bors commented Dec 2, 2019

Uh oh!

RalfJung commented Dec 2, 2019

Uh oh!

bors commented Dec 2, 2019

Uh oh!

bors commented Dec 2, 2019

Uh oh!

bors commented Dec 2, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

RalfJung commented Nov 29, 2019•
edited
Loading

RalfJung commented Dec 1, 2019•
edited
Loading