Avoid ICE when pretty-printing non-local MIR item. #39311
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
eddyb
suggested changes
Jan 26, 2017
| @@ -92,7 +92,7 @@ pub fn write_mir_pretty<'a, 'b, 'tcx, I>(tcx: TyCtxt<'b, 'tcx, 'tcx>, | |||
| where I: Iterator<Item=DefId>, 'tcx: 'a | |||
| { | |||
| let mut first = true; | |||
| for def_id in iter { | |||
| for def_id in iter.into_iter().filter(DefId::is_local) { | |||
There was a problem hiding this comment.
Oops... I've built up too much of a reflex going from in collection to in collection.into_iter().foo().
This comes up when using `-Zunstable-options --unpretty=mir`. Previously, rustc would ICE due to an unwrap later in this function (after `as_local_node_id`). Instead, we should just ignore items from other crates when pretty-printing MIR.
eddyb
approved these changes
Jan 26, 2017
|
@bors r+ rollup |
|
📌 Commit 8ad06af has been approved by |
alexcrichton
added a commit
to alexcrichton/rust
that referenced
this pull request
Jan 28, 2017
…r=eddyb Avoid ICE when pretty-printing non-local MIR item. This comes up when using `-Zunstable-options --unpretty=mir`. Previously, rustc would ICE due to an unwrap later in this function (after `as_local_node_id`). Instead, we should just ignore items from other crates when pretty-printing MIR. This was reported in #rust: [this playground code](https://is.gd/PSMBZS) causes an ICE if you click the MIR button. The problem is the mention of the non-local item `std::usize::MAX`, so you can reduce the test case [a lot](https://is.gd/SaLjaa). r? @eddyb
bors
added a commit
that referenced
this pull request
Jan 28, 2017
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
This comes up when using
-Zunstable-options --unpretty=mir. Previously, rustc would ICE due to an unwrap later in this function (afteras_local_node_id). Instead, we should just ignore items from other crates when pretty-printing MIR.This was reported in #rust: this playground code causes an ICE if you click the MIR button. The problem is the mention of the non-local item
std::usize::MAX, so you can reduce the test case a lot.r? @eddyb