Clean up ProtocolConformance::subst() and fix crash exposed by coroutines work #18978
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
force-pushed
the
clean-up-conformance-subst
branch
from
18a05a0 to
d73ccd9
Compare
Instead of using the callback form of SubstitutionMap::get(), let's use the lower-level form that takes the replacement array and conformances array directly, allowing us to bypass several calls of subst() on 'this'.
slavapestov
force-pushed
the
clean-up-conformance-subst
branch
from
d73ccd9 to
9cbb944
Compare
Contributor
Author
|
@swift-ci Please test |
Contributor
Author
|
@swift-ci Please test source compatibility |
I think the assertion failure referenced from the FIXME comment has been fixed.
slavapestov
force-pushed
the
clean-up-conformance-subst
branch
from
9cbb944 to
a71710b
Compare
Contributor
Author
|
@swift-ci Please test |
1 similar comment
Contributor
Author
|
@swift-ci Please test |
Contributor
Author
|
@swift-ci Please test source compatibility |
Contributor
Author
|
@swift-ci Please test |
Contributor
Author
|
@swift-ci Please test source compatibility |
slavapestov
changed the title
Contributor
Author
|
@adrian-prantl Please take a look at the debug info change. |
| }); | ||
| for (auto ParamType : Sig->getSubstitutableParams()) { | ||
| if (!Type(ParamType).subst(SubsMap)->isEqual(ParamType)) | ||
| return true; |
DougGregor
reviewed
Aug 27, 2018
Member
DougGregor
left a comment
DougGregor
left a comment
There was a problem hiding this comment.
This is so much cleaner, thank you!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Fixes https://bugs.swift.org/browse/SR-8643 and simplifies some related code. Also addresses FIXMEs introduced by #18366.