GSB: Fix some issues with concrete same-type requirements #36576
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
slavapestov
force-pushed
the
concrete-constraint-calamity
branch
from
0f68c29 to
180e5cb
Compare
…tead of the minimized ones We rebuild a signature after dropping redundant conformance requirements, since conformance requirements change the canonical type and conformance access path computation. When doing this, instead of using the canonical requirements from the signature, use the original as-written requirements. This fixes some weirdness around concrete same-type requirements. There's a philosophical benefit here too -- since we rebuild the signature without ever having built the old signature, we never create an invalid GenericSignature in the ASTContext. Fixes rdar://problem/75690903.
slavapestov
force-pushed
the
concrete-constraint-calamity
branch
from
21a1c8c to
99d49f0
Compare
|
@swift-ci Please smoke test |
|
@swift-ci Please test source compatibility |
slavapestov
commented
Mar 25, 2021
| @@ -270,7 +270,7 @@ struct X18: P18, P17 { | |||
| } | |||
|
|
|||
| // CHECK-LABEL: .X19.foo@ | |||
| // CHECK: Generic signature: <T, U where T == X18> | |||
| // CHECK: Generic signature: <T, U where T == X18.A> | |||
There was a problem hiding this comment.
This is just a change in printed sugar that doesn't affect the canonical signature. X18.A is X18, so we're ending up with this because of T == T.A vs T == X18.
|
@swift-ci Please smoke test macOS |
|
@swift-ci Please test |
|
Build failed |
|
@swift-ci please smoke test Linux |
|
@swift-ci Please test Linux |
|
@swift-ci Please test Windows |
|
Build failed |
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.
Builds upon #36577. Fixes rdar://problem/75656022 and rdar://problem/74395460.