-
Notifications
You must be signed in to change notification settings - Fork 10.6k
Optimizer: fix handling of dependent existential archetypes in alloc_stack
and apply
simplification
#83898
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
eeckstein
merged 2 commits into
swiftlang:main
from
eeckstein:fix-simplify-alloc-stack-apply
Aug 27, 2025
Merged
Optimizer: fix handling of dependent existential archetypes in alloc_stack
and apply
simplification
#83898
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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 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 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -216,8 +216,9 @@ private extension FullApplySite { | |
// Make sure that existential archetype _is_ a replacement type and not e.g. _contained_ in a | ||
// replacement type, like | ||
// apply %1<Array<@opened("...")>() | ||
guard substitutionMap.replacementTypes.contains(where: { $0.isExistentialArchetype }), | ||
substitutionMap.replacementTypes.allSatisfy({ $0.isExistentialArchetype || !$0.hasLocalArchetype }) | ||
// TODO: support non-root existential archetypes | ||
guard substitutionMap.replacementTypes.contains(where: { $0.isRootExistentialArchetype }), | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why is this a precondition? |
||
substitutionMap.replacementTypes.allSatisfy({ $0.isRootExistentialArchetype || !$0.hasLocalArchetype }) | ||
else { | ||
return false | ||
} | ||
|
@@ -237,9 +238,9 @@ private extension FullApplySite { | |
let type = value.type | ||
// Allow three cases: | ||
// case 1. the argument _is_ the existential archetype | ||
return type.isExistentialArchetype || | ||
return type.isRootExistentialArchetype || | ||
// case 2. the argument _is_ a metatype of the existential archetype | ||
(type.isMetatype && type.canonicalType.instanceTypeOfMetatype.isExistentialArchetype) || | ||
(type.isMetatype && type.canonicalType.instanceTypeOfMetatype.isRootExistentialArchetype) || | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can't you handle all the cases by transforming the type recursively? |
||
// case 3. the argument has nothing to do with the existential archetype (or any other local archetype) | ||
!type.hasLocalArchetype | ||
} | ||
|
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 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 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 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would prefer we just fixed this with the right abstractions. You can get this from the conformance of Self to the protocol, stored in the init_existential instruction.