refactor goto_block and also add unwind_to_block #66646
Merged
Conversation
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
rust-highfive
added
the
S-waiting-on-review
oli-obk
requested changes
Nov 23, 2019
RalfJung
force-pushed
the
unwind_to_block
branch
from
82c6467 to
419d3fc
Compare
This comment has been minimized.
This comment has been minimized.
|
The corresponding Miri PR is at rust-lang/miri#1077 |
oli-obk
reviewed
Nov 26, 2019
| @@ -268,34 +274,39 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> { | |||
| // exception from the exception.) | |||
| // This is the dual to the special exception for offset-by-0 | |||
| // in the inbounds pointer offset operation (see the Miri code, `src/operator.rs`). | |||
| if a.is_bits() && b.is_bits() { | |||
| // | |||
| // Control flow is weird because we cannot early-return (to reach the | |||
There was a problem hiding this comment.
we have a bunch of situations like that in miri... Maybe we should consider using try blocks at some point
|
@bors r+ |
|
📌 Commit 6797d52 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Nov 26, 2019
refactor goto_block and also add unwind_to_block r? @oli-obk
|
☀️ Test successful - checks-azure |
rust-highfive
added a commit
to rust-lang-nursery/rust-toolstate
that referenced
this pull request
Nov 27, 2019
Tested on commit rust-lang/rust@a7d791b. Direct link to PR: <rust-lang/rust#66646> 💔 miri on windows: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung, @rust-lang/infra). 💔 miri on linux: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung, @rust-lang/infra).
bors
added a commit
to rust-lang/miri
that referenced
this pull request
Nov 27, 2019
adjust for goto_block refactoring The Miri side of rust-lang/rust#66646
bors
added a commit
to rust-lang/miri
that referenced
this pull request
Nov 27, 2019
adjust for goto_block refactoring The Miri side of rust-lang/rust#66646
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
r? @oli-obk