Revert "AST: Early exit from subst() if the type is concrete" #6269
+0
−9
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
This reverts commit e653e00. This commit caused SIL verification errors with the "buildbot,tools=RA,stdlib=RD" preset. The root cause is that we're still not consistently setting the recursive properties of the NameAliasType, so the early exit in Type::subst() was falsely taken even when the underlying type of the NameAliasType contained archetypes. The lazy 'mapTypeOutOfContext()' applied to the underlying type complicates matters since we can't know the recursive properties until the alias type has been desugared for the first time. A correct fix is to store the underlying type of a type alias as an interface type, and set the recursive properties right away when the type alias is deserialized; until that's done, reverting this is an adequate workaround. Fixes <rdar://problem/29642870>.
|
preset=buildbot,tools=RA,stdlib=RD |
|
@swift-ci Please smoke test |
|
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.
This reverts commit e653e00.
This commit caused SIL verification errors with the
"buildbot,tools=RA,stdlib=RD" preset.
The root cause is that we're still not consistently setting the
recursive properties of the NameAliasType, so the early exit
in Type::subst() was falsely taken even when the underlying
type of the NameAliasType contained archetypes.
The lazy 'mapTypeOutOfContext()' applied to the underlying type
complicates matters since we can't know the recursive properties
until the alias type has been desugared for the first time.
A correct fix is to store the underlying type of a type alias as
an interface type, and set the recursive properties right away
when the type alias is deserialized; until that's done, reverting
this is an adequate workaround.
Fixes rdar://problem/29642870.