Some miri cleanups #46743
Merged
Some miri cleanups #46743
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
eddyb
reviewed
Dec 15, 2017
| let (ptr, ty) = ptr_ty?; | ||
| let ecx = mk_eval_cx(tcx, instance.substs, param_env); |
There was a problem hiding this comment.
Is the new substs field on EvalContext just for this?
There was a problem hiding this comment.
jup. We used to push a stackframe just to have substs.
There was a problem hiding this comment.
I removed the substs part and just simplified the interface
oli-obk
force-pushed
the
miri
branch
2 times, most recently
from
47dc339 to
0d68080
Compare
kennytm
added
the
S-waiting-on-review
kennytm
reviewed
Dec 15, 2017
| Err(err) | ||
| }, | ||
| ((Err(_), _), Err(err)) => Err(err), | ||
| ((Ok((miri_val, miri_ty)), mut ecx), Ok(ctfe)) => { | ||
| (Err(_), Err(err)) => Err(err), |
There was a problem hiding this comment.
Heh strange. Why these two arms are not merged 😄
(_, Err(err)) => Err(err),There was a problem hiding this comment.
Because the next commit will unmerge them because it's going to process the miri result ;)
eddyb
approved these changes
Dec 15, 2017
|
✌️ @oli-obk can now approve this pull request |
|
@bors r=eddyb |
|
📌 Commit 2d161f1 has been approved by |
kennytm
added
S-waiting-on-bors
|
☀️ Test successful - status-appveyor, status-travis |
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? @eddyb