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

proper support for Assert MIR terminators #1084

Merged
merged 16 commits into from Dec 2, 2019
Merged

Conversation

RalfJung
Copy link
Member

Fixes #1070
Blocked on rust-lang/rust#66874

@bors

This comment has been minimized.

@RalfJung RalfJung force-pushed the assert-panic branch 2 times, most recently from 6a7206a to 2cba42b Compare December 1, 2019 11:49
@bors
Copy link
Collaborator

bors commented Dec 2, 2019

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

bors added a commit to rust-lang/rust 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
@RalfJung
Copy link
Member Author

RalfJung commented Dec 2, 2019

@bors r+

@bors
Copy link
Collaborator

bors commented Dec 2, 2019

📌 Commit 2ef5ac1 has been approved by RalfJung

@bors
Copy link
Collaborator

bors commented Dec 2, 2019

⌛ Testing commit 2ef5ac1 with merge c00b4b3...

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

Fixes #1070
Blocked on rust-lang/rust#66874
@bors
Copy link
Collaborator

bors commented Dec 2, 2019

💔 Test failed - status-appveyor

@RalfJung
Copy link
Member Author

RalfJung commented Dec 2, 2019

@bors r+

@bors
Copy link
Collaborator

bors commented Dec 2, 2019

📌 Commit ce7b44b has been approved by RalfJung

@bors
Copy link
Collaborator

bors commented Dec 2, 2019

⌛ Testing commit ce7b44b with merge 913226a...

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

Fixes #1070
Blocked on rust-lang/rust#66874
@bors
Copy link
Collaborator

bors commented Dec 2, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: RalfJung
Pushing 913226a to master...

@bors bors merged commit ce7b44b into rust-lang:master Dec 2, 2019
@RalfJung RalfJung deleted the assert-panic branch December 3, 2019 17:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-blocked-on-rust Status: Blocked on landing a Rust PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"Built-in" panics (e.g. OOB array access) cannot be caught
2 participants