[SourceKit] Don’t transform type when printing if CurrentType can’t have members #36989
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
…ave members Since 9ba892c we always transform `CurrentType` in `ASTPrinter` to be an interface type. This causes issues when the variable type is a generic parameter type. Previously we had `CurrentType` set to a `PrimaryArchetypeType`. With the fix in d93ae06, we are mapping the archetype out of context to a `GenericParamType`. A `GenericParamType`, however, can’t have members, so we’re hitting an assertion when creating a `TypeTransformContext`. Since the entire type transformation in `printTransformedTypeWithOptions` is only affecting type members, we should be able to safely skip over the transformation if `CurrentType` can’t have any members. Fixes rdar://76750555 [SR-14497]
|
@swift-ci Please test |
slavapestov
approved these changes
Apr 26, 2021
| @@ -755,7 +755,7 @@ class PrintAST : public ASTVisitor<PrintAST> { | |||
| void printType(Type T) { printTypeWithOptions(T, Options); } | |||
|
|
|||
| void printTransformedTypeWithOptions(Type T, PrintOptions options) { | |||
| if (CurrentType && Current) { | |||
| if (CurrentType && Current && CurrentType->mayHaveMembers()) { | |||
| if (T->hasArchetype()) { | |||
| // Get the interface type, since TypeLocs still have | |||
| // contextual types in them. | |||
There was a problem hiding this comment.
I'm wondering if the mapTypeOutOfContext() is needed at all...
There was a problem hiding this comment.
It appears to be not. I’ll set up a follow-up PR removing it.
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.
Since 9ba892c we always transform
CurrentTypeinASTPrinterto be an interface type.This causes issues when the variable type is a generic parameter type. Previously we had
CurrentTypeset to aPrimaryArchetypeType. With the fix in d93ae06, we are mapping the archetype out of context to aGenericParamType. AGenericParamType, however, can’t have members, so we’re hitting an assertion when creating aTypeTransformContext. Since the entire type transformation inprintTransformedTypeWithOptionsis only affecting type members, we should be able to safely skip over the transformation ifCurrentTypecan’t have any members.Fixes rdar://76750555 [SR-14497]