Conversation
chescock
added
C-Feature
Zeophlite
added
the
S-Merge-Conflicts
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Objective
Support mutable queries using
NestedQuery.The reason this was not supported in the initial version is that we want
NestedQuery<D, F>::ReadOnly == NestedQuery<D::ReadOnly, F>, but that doesn't satisfy theReadOnly::State == Stateconstraint sinceQueryState<D::ReadOnly, F> != QueryState<D, F>.Solution
Store
QueryState<D::ReadOnly, F>in theState. SinceD::ReadOnly::ReadOnly == D::ReadOnly, that ensures the states match.In order to simplify the safety proofs and ensure we always convert it back to the appropriate type, introduce an
ErasedQueryStatewrapper type that prevents accidental access to the innerQueryState<D::ReadOnly, F>.Adopted and modified from #25642. See also #25652 for context.