[draft] Rework the way we treat opaques in check_opaque_meets_bounds
#124598
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
This comment has been minimized.
This comment has been minimized.
lcnr
reviewed
May 2, 2024
| pub fn can_define_opaque_ty(&self, id: impl Into<DefId>) -> bool { | ||
| let Some(id) = id.into().as_local() else { return false }; | ||
| self.defining_opaque_types.contains(&id) | ||
| pub fn treat_opaque_ty(&self, reveal: Reveal, def_id: DefId) -> TreatOpaque { |
| return None; | ||
| match self.treat_opaque_ty(param_env.reveal(), def_id) { | ||
| TreatOpaque::Define => {} | ||
| TreatOpaque::Reveal | TreatOpaque::Rigid => return None, |
There was a problem hiding this comment.
Suggested change
| TreatOpaque::Reveal | TreatOpaque::Rigid => return None, | |
| // FIXME: We should normalize with `TreatOpaque::Revael`, either | |
| // eagerly, allowing us to ICE here, or lazily by revealing the | |
| // hidden type here. | |
| TreatOpaque::Reveal | TreatOpaque::Rigid => return None, |
| @@ -82,6 +82,13 @@ pub enum Reveal { | |||
| All, | |||
| } | |||
|
|
|||
| pub enum TreatOpaque { | |||
| @@ -194,15 +194,15 @@ impl<'tcx> CapturedPlace<'tcx> { | |||
|
|
|||
| #[derive(Copy, Clone, Debug, HashStable)] | |||
| pub struct ClosureTypeInfo<'tcx> { | |||
| user_provided_sig: ty::CanonicalPolyFnSig<'tcx>, | |||
| user_provided_sig: &'tcx ty::CanonicalPolyFnSig<'tcx>, | |||
There was a problem hiding this comment.
type sizes get larger so it makes some query machinery complain
| )] | ||
| #[cfg_attr(feature = "nightly", derive(TyEncodable, TyDecodable, HashStable_NoContext))] | ||
| pub enum OpaqueTypeMode<I: Interner> { | ||
| Define(I::DefiningOpaqueTypes), |
There was a problem hiding this comment.
the type alias should get renamed to I::DefIdList or sth 🤷
| @@ -1,5 +1,5 @@ | |||
| //@ build-pass | |||
| //@ ignore-compare-mode-next-solver (hangs) | |||
| //@ ignore-test (hangs) | |||
There was a problem hiding this comment.
well this should be fixed before this lands, dont think we can land in this state bc it will definitely break a real crate
|
The job Click to see the possible cause of the failure (guessed by this bot) |
|
☔ The latest upstream changes (presumably #125864) made this pull request unmergeable. Please resolve the merge conflicts. |
|
@rustbot author :3 (or just graveyard tbf) |
rustbot
added
S-waiting-on-author
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 24, 2024
TypingMode 🤔 unsure how and whether to actually get this ready for merge, opening for input + perf for now #### `TypingMode::from_param_env` I am using this even in cases where I know that the `param_env` will always be `Reveal::UserFacing`. This is to make it easier to correctly refactor this code in the future, any time we use `Reveal::UserFacing` in a body while not defining its opaque types is incorrect and should use a `TypingMode` which only reveals opaques defined by that body instead, cc rust-lang#124598 r? `@compiler-errors`
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 29, 2024
TypingMode: merge intercrate, reveal, and defining_opaque_types This adds `TypingMode` and uses it in most places. We do not yet remove `Reveal` from `param_env`s. This and other future work as tracked in rust-lang#132279 and via `FIXME`s. Fetching the `TypingMode` of the `InferCtxt` asserts that the `TypingMode` agrees with `ParamEnv::reveal` to make sure we don't introduce any subtle bugs here. This will be unnecessary once `ParamEnv::reveal` no longer exists. As the `TypingMode` is now a part of the query input, I've merged the coherence and non-coherence caches for the new solver. I've also enabled the local `infcx` cache during coherence by clearing the cache when forking it with a different `TypingMode`. #### `TypingMode::from_param_env` I am using this even in cases where I know that the `param_env` will always be `Reveal::UserFacing`. This is to make it easier to correctly refactor this code in the future, any time we use `Reveal::UserFacing` in a body while not defining its opaque types is incorrect and should use a `TypingMode` which only reveals opaques defined by that body instead, cc rust-lang#124598 r? `@compiler-errors`
workingjubilee
added a commit
to workingjubilee/rustc
that referenced
this pull request
Oct 30, 2024
TypingMode: merge intercrate, reveal, and defining_opaque_types This adds `TypingMode` and uses it in most places. We do not yet remove `Reveal` from `param_env`s. This and other future work as tracked in rust-lang#132279 and via `FIXME`s. Fetching the `TypingMode` of the `InferCtxt` asserts that the `TypingMode` agrees with `ParamEnv::reveal` to make sure we don't introduce any subtle bugs here. This will be unnecessary once `ParamEnv::reveal` no longer exists. As the `TypingMode` is now a part of the query input, I've merged the coherence and non-coherence caches for the new solver. I've also enabled the local `infcx` cache during coherence by clearing the cache when forking it with a different `TypingMode`. #### `TypingMode::from_param_env` I am using this even in cases where I know that the `param_env` will always be `Reveal::UserFacing`. This is to make it easier to correctly refactor this code in the future, any time we use `Reveal::UserFacing` in a body while not defining its opaque types is incorrect and should use a `TypingMode` which only reveals opaques defined by that body instead, cc rust-lang#124598 r? `@compiler-errors`
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Oct 30, 2024
TypingMode: merge intercrate, reveal, and defining_opaque_types This adds `TypingMode` and uses it in most places. We do not yet remove `Reveal` from `param_env`s. This and other future work as tracked in rust-lang#132279 and via `FIXME`s. Fetching the `TypingMode` of the `InferCtxt` asserts that the `TypingMode` agrees with `ParamEnv::reveal` to make sure we don't introduce any subtle bugs here. This will be unnecessary once `ParamEnv::reveal` no longer exists. As the `TypingMode` is now a part of the query input, I've merged the coherence and non-coherence caches for the new solver. I've also enabled the local `infcx` cache during coherence by clearing the cache when forking it with a different `TypingMode`. #### `TypingMode::from_param_env` I am using this even in cases where I know that the `param_env` will always be `Reveal::UserFacing`. This is to make it easier to correctly refactor this code in the future, any time we use `Reveal::UserFacing` in a body while not defining its opaque types is incorrect and should use a `TypingMode` which only reveals opaques defined by that body instead, cc rust-lang#124598 r? ``@compiler-errors``
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 30, 2024
Rollup merge of rust-lang#131856 - lcnr:typing-mode, r=compiler-errors TypingMode: merge intercrate, reveal, and defining_opaque_types This adds `TypingMode` and uses it in most places. We do not yet remove `Reveal` from `param_env`s. This and other future work as tracked in rust-lang#132279 and via `FIXME`s. Fetching the `TypingMode` of the `InferCtxt` asserts that the `TypingMode` agrees with `ParamEnv::reveal` to make sure we don't introduce any subtle bugs here. This will be unnecessary once `ParamEnv::reveal` no longer exists. As the `TypingMode` is now a part of the query input, I've merged the coherence and non-coherence caches for the new solver. I've also enabled the local `infcx` cache during coherence by clearing the cache when forking it with a different `TypingMode`. #### `TypingMode::from_param_env` I am using this even in cases where I know that the `param_env` will always be `Reveal::UserFacing`. This is to make it easier to correctly refactor this code in the future, any time we use `Reveal::UserFacing` in a body while not defining its opaque types is incorrect and should use a `TypingMode` which only reveals opaques defined by that body instead, cc rust-lang#124598 r? ``@compiler-errors``
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.
uwu
r? lcnr