Do not intern filemap to entry w/ mismatched length. #37449
Merged
Conversation
This file contains 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
|
r? @eddyb (rust_highfive has picked a reviewer for you, use r? to override) |
pnkfelix
added
T-compiler
pnkfelix
commented
Oct 28, 2016
| @@ -1193,6 +1207,10 @@ impl<'a, 'tcx> CrateMetadata { | |||
| } | |||
|
|
|||
| fn are_equal_modulo_startpos(fm1: &syntax_pos::FileMap, fm2: &syntax_pos::FileMap) -> bool { | |||
There was a problem hiding this comment.
(maybe we should move this to a method on FileMap, the idea being that future modifications to FileMap, such as adding new fields, would know to update the method accordingly. But that can wait for a future PR; I prefer to keep this one minimal.)
|
@bors r+ |
|
📌 Commit 3f639a0 has been approved by |
|
@bors p=7 This blocks Servo. |
|
⌛ Testing commit 3f639a0 with merge 9dbc147... |
|
💔 Test failed - auto-linux-64-opt |
|
Confirming: I’ve managed to build servo/servo#13813 (which is blocked on this ICE) with a rustc from this PR. |
|
|
|
|
@bors: retry |
bors
added a commit
that referenced
this pull request
Oct 29, 2016
Do not intern filemap to entry w/ mismatched length. Do not intern filemap to entry w/ mismatched length. Fix #37274 (I think). Beta-nominated; note that only the second commit needs to be cherry picked to beta branch. (The first just adds some debug instrumentation that I wish had been present.)
|
Seems like a low-risk backport. |
Merged
nikomatsakis
added
the
beta-accepted
|
Approving for beta backport: appears to be super low risk. cc @rust-lang/compiler |
brson
removed
the
beta-nominated
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.
Do not intern filemap to entry w/ mismatched length.
Fix #37274 (I think).
Beta-nominated; note that only the second commit needs to be cherry picked to beta branch. (The first just adds some debug instrumentation that I wish had been present.)