Also erase substs for new infcx in pin move error #107422
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
The code originally correctly erased the regions of the type it passed to the newly created infcx. But after the `fn_sig` query was made to return an `EarlyBinder<T>`, some substs that were around were substituted there without erasing their regions. They were then passed into the newly cerated infcx, which caused the ICE.
rustbot
added
S-waiting-on-review
|
cc @lcnr @kylematsuda apparently this is something that can happen in some places and needs some extra care when adding new subst calls :) |
|
@bors r=compiler-errors rollup |
bors
added
S-waiting-on-bors
4 tasks
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 29, 2023
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#106618 (Disable `linux_ext` in wasm32 and fortanix rustdoc builds.) - rust-lang#107097 (Fix def-use dominance check) - rust-lang#107154 (library/std/sys_common: Define MIN_ALIGN for m68k-unknown-linux-gnu) - rust-lang#107397 (Gracefully exit if --keep-stage flag is used on a clean source tree) - rust-lang#107401 (remove the usize field from CandidateSource::AliasBound) - rust-lang#107413 (make more pleasant to read) - rust-lang#107422 (Also erase substs for new infcx in pin move error) - rust-lang#107425 (Check for missing space between fat arrow and range pattern) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
lcnr
reviewed
Jan 30, 2023
| @@ -1128,8 +1128,12 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> { | |||
| "{place_name} {partially_str}moved due to this method call{loop_message}", | |||
| ), | |||
| ); | |||
|
|
|||
| let infcx = tcx.infer_ctxt().build(); | |||
There was a problem hiding this comment.
why do we even create a new infcx here instead of using self.infcx?
There was a problem hiding this comment.
Regions already solve so can_eq ices
There was a problem hiding this comment.
@compiler-errors suggested it in #106095 (comment)
There was a problem hiding this comment.
remember that someone told me the reason behind this before and I forgot 😅
might be nice to add a comment about this here, but apart from that this does feel like a pretty good solution 🤔
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.
The code originally correctly erased the regions of the type it passed to the newly created infcx. But after the
fn_sigquery was made to return anEarlyBinder<T>, some substs that were around were substituted there without erasing their regions. They were then passed into the newly cerated infcx, which caused the ICE.Fixes #107419
r? compiler-errors who reviewed the original PR adding this diagnostic