RequirementMachine: More miscellaneous fixes #39189
Merged
Conversation
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
…heritance clause
This enabled a gross idiom that should not have been allowed in the first place:
typealias G<T> = Any where T : P
protocol P {}
protocol Q : G<Self> {} // Q inherits from P now!
I'd like to ban this, assuming nothing is actually relying on this behavior.
…closely Extension binding and resolution of inherited protocols uses a more primitive 'declaration' based lookup that resolves a TypeRepr directly to a set of NominalTypeDecls. This lookup differs from type resolution in a few subtle ways, namely the handling of ambiguity. In particular, if there are multiple declarations with the same name, the primitive lookup returns all of them, since it cannot perform the full ambiguity check done in type resolution, which looks at typealias underlying types. However, in the case where the multiple results are all nominal types, we can definitely fail the 'decl' name lookup right away.
…iated types If two associated types in an (invalid) protocol have the same name, use their source location to order them instead of their memory address. This fixes a non-deterministic test failure with the requirement machine enabled.
Now that directReferencesForTypeRepr() no longer returns ambiguous results, move the special ambiguity diagnostic out of CustomAttrNominalRequest::evaluate(), and instead diagnose these situations in TypeCheckAttr.cpp. Special-case the 'unknown type' diagnostic though, to report 'unknown attribute' in the common case where the name lookup failed.
|
@swift-ci Please smoke test |
|
@swift-ci Please test source compatibility |
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.
Well, none of these changes actually touch the requirement machine implementation, only adjacent code. With these fixes, we're down to one validation test failure when the requirement machine is enabled.