Skip to content

Small fixes for new abstract conformance representation #80327

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 8 commits into from
Apr 1, 2025
Merged

Small fixes for new abstract conformance representation #80327

merged 8 commits into from
Apr 1, 2025

Conversation

slavapestov
Copy link
Contributor

@slavapestov slavapestov commented Mar 27, 2025 •
edited
Loading

  • ProtocolConformanceRef::subst() and ProtocolConformanceRef::mapConformanceOutOfContext() didn't handle abstract conformances with opaque result types in them correctly. We must now substitute the opaque result type and form a new abstract conformance, instead of returning the same one.
  • ProtocolConformanceRef::getAssociatedConformance() would return an abstract conformance with the original subject type and not the subject type of the requirement.
  • ReplaceOpaqueTypesWithUnderlyingTypes also required some fixes to deal with new abstract conformances.
  • Finally, rename TypeTransformer::transformSubMap() to transformSubstitutionMap(). Previously we weren't calling TypeSubstituter::transformSubstitutionMap(), and now we are. This exposed all of the above bugs.

@slavapestov slavapestov changed the title AST: Rename TypeTransform::transformSubMap() Small fixes for new abstract conformance representation Mar 28, 2025
@slavapestov
ASTDumper: Dump conforming type of abstract conformance
e3fdeaf
@slavapestov
AST: Handle new abstract conformances in ProtocolConformanceRef::subst()
151b1f1
@slavapestov
AST: Use correct functor in ProtocolConformanceRef::mapConformanceOut…
ce3f6e0 
…OfContext()
@slavapestov
AST: Handle new abstract conformances in ProtocolConformanceRef::mapC…
4433fe3 
…onformanceOutOfContext()
@slavapestov
AST: Fix wrong subject type in ProtocolConformanceRef::getAssociatedC…
b53b770 
…onformance()
@slavapestov
AST: Fix up ReplaceOpaqueTypesWithUnderlyingTypes::operator()
4b711b6 
This was constructing abstract conformances with the wrong subject type.
@slavapestov
AST: Don't need to pass down the options here
75c8a16
@slavapestov
AST: Rename TypeTransform::transformSubMap()
865c040 
TypeSubstituter's version was called transformSubstitutionMap(),
and it was never being called as a result. Rename the first one
to match.
@slavapestov slavapestov requested a review from jckarter as a code owner April 1, 2025 03:11
@slavapestov
Copy link
Contributor Author

@swift-ci Please smoke test

@slavapestov
Copy link
Contributor Author

@swift-ci Please test source compatibility

@slavapestov slavapestov merged commit 3992fd9 into swiftlang:main Apr 1, 2025
5 checks passed
@slavapestov slavapestov mentioned this pull request Apr 23, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xedin xedin xedin approved these changes

@hborla hborla Awaiting requested review from hborla hborla is a code owner

@artemcm artemcm Awaiting requested review from artemcm artemcm is a code owner

@tshortli tshortli Awaiting requested review from tshortli tshortli is a code owner

@jckarter jckarter Awaiting requested review from jckarter jckarter is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@slavapestov @xedin