rustc_typeck: do not overlap a borrow of TypeckTables with method lookup. #42480
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
eddyb
added
the
beta-nominated
|
Nominating for backport because the bug has already reached beta. |
nikomatsakis
requested changes
Jun 6, 2017
| @@ -446,9 +446,10 @@ impl<'a, 'gcx, 'tcx> ConfirmContext<'a, 'gcx, 'tcx> { | |||
| // overloaded lvalue ops, and will be fixed by them in order to get | |||
| // the correct region. | |||
| let mut source = self.node_ty(expr.id); | |||
| if let Some(adjustments) = self.tables.borrow_mut().adjustments.get_mut(&expr.id) { | |||
| let previous_adjustments = self.tables.borrow_mut().adjustments.remove(&expr.id); | |||
There was a problem hiding this comment.
maybe worth a comment here explaining why the remove-and-then-reinsert?
|
@bors r=nikomatsakis |
|
📌 Commit b02e3a1 has been approved by |
|
⌛ Testing commit b02e3a1 with merge 89fceaa... |
bors
added a commit
that referenced
this pull request
Jun 7, 2017
rustc_typeck: do not overlap a borrow of TypeckTables with method lookup. If trait selection is reached, it could potentially request a closure signature, which will have to borrow the `TypeckTables` of the current function, and so those tables *should not* be mutably borrowed. Fixes #42463. r? @nikomatsakis
|
☀️ Test successful - status-appveyor, status-travis |
brson
added
the
beta-accepted
Merged
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.
If trait selection is reached, it could potentially request a closure signature, which will have to borrow the
TypeckTablesof the current function, and so those tables should not be mutably borrowed.Fixes #42463.
r? @nikomatsakis