Use region-erased self type during IAT selection #109423
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
rustbot
added
S-waiting-on-review
| @@ -2224,6 +2224,9 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o { | |||
| } | |||
| }; | |||
|
|
|||
| // Regions are not considered during selection. | |||
| let erased_self_ty = tcx.fold_regions(self_ty, |_, _| tcx.lifetimes.re_erased); | |||
There was a problem hiding this comment.
I'm going back and forth whether we should use replace_escaping_bound_vars_uncached here instead...
If you don't want to use that, can you at least leave a FIXME saying that this only needs to deal w escaping bound vars (and not, e.g., early-bound regions), and it currently doesn't handle ty/const late-bound vars correctly?
|
r=me with nits dealt with either way, @bors delegate+ |
|
✌️ @fmease can now approve this pull request |
fmease
force-pushed
the
iat-selection-erase-regions-in-self-ty
branch
from
9d666eb to
293f21c
Compare
|
@bors r=compiler-errors |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 21, 2023
…-in-self-ty, r=compiler-errors Use region-erased self type during IAT selection Split off from rust-lang#109410 as discussed. Fixes rust-lang#109299. Re UI test: I use a reproducer of rust-lang#109299 that contains a name resolution error instead of reproducer [`regionck-2.rs`](https://github.com/rust-lang/rust/blob/fc7ed4af165c27ab5914b93251194f826920cc65/tests/ui/associated-inherent-types/regionck-2.rs) (as found in the `AliasKind::Inherent` PR) since it would (incorrectly) pass typeck in this PR due to the lack of regionck and I'd rather not make *that* a regression test (with or without `known-bug`). `@rustbot` label F-inherent_associated_types r? `@compiler-errors`
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 23, 2023
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#108954 (rustdoc: handle generics better when matching notable traits) - rust-lang#109203 (refactor/feat: refactor identifier parsing a bit) - rust-lang#109213 (Eagerly intern and check CrateNum/StableCrateId collisions) - rust-lang#109358 (rustc: Remove unused `Session` argument from some attribute functions) - rust-lang#109359 (Update stdarch) - rust-lang#109378 (Remove Ty::is_region_ptr) - rust-lang#109423 (Use region-erased self type during IAT selection) - rust-lang#109447 (new solver cleanup + implement coherence) - rust-lang#109501 (make link clickable) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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.
Split off from #109410 as discussed.
Fixes #109299.
Re UI test: I use a reproducer of #109299 that contains a name resolution error instead of reproducer
regionck-2.rs(as found in theAliasKind::InherentPR) since it would (incorrectly) pass compilation in this PR due to the lack of regionck and I'd rather not make that a regression test (with or withoutknown-bug).@rustbot label F-inherent_associated_types
r? @compiler-errors