[6.2] SIL: Use SubstitutionMap::mapIntoTypeExpansionContext() in SILTypeSubstituter #81080
+24
−14
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
changed the title
DougGregor
approved these changes
Apr 24, 2025
|
@swift-ci Please test |
…stituter I made a mistake in 47156e0. There was a call to call to forAbstract() in SILTypeSubstituter that passed in the wrong subject ype. This call was inside SILTypeSubstituter's own implementation of replacing opaque types with underlying types in a substitution map. This duplicates an existing utility method in SubstitutionMap anyway, so let's just use that instead. Fixes rdar://149353285.
slavapestov
force-pushed
the
fix-rdar149353285-6.2
branch
from
0a62be2 to
88814e4
Compare
|
@swift-ci Please test |
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.
6.2 cherry-pick of #81079.
Description: Replace some incorrect duplicated code with a call to the right utility method. The old implementation was wrong in the provided test case.
Scope of the issue: The assertion failure was introduced by AST: Check subject type in ProtocolConformanceRef::forAbstract() #80304, although the actual problem is a bit older.
Radar: rdar://149353285.
Reviewed by: @DougGregor