[5.0] Allow Error to conform to itself #21073
Merged
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
Most of the foundation for this was laid in earlier patches.
|
@swift-ci Please test. |
rjmccall
changed the title
AnnaZaks
approved these changes
Dec 7, 2018
slavapestov
reviewed
Dec 7, 2018
|
|
||
| // Due to an IRGen limitation, witness tables cannot be passed from an | ||
| // existential to an archetype parameter, so for now we restrict this to | ||
| // @objc protocols. |
There was a problem hiding this comment.
This comment is out of date?
There was a problem hiding this comment.
It certainly needs updating, yeah. I'll do that on master.
| @@ -3575,15 +3575,23 @@ SILGenFunction::emitVTableThunk(SILDeclRef derived, | |||
| enum class WitnessDispatchKind { | |||
| Static, | |||
| Dynamic, | |||
| Class | |||
| Class, | |||
| Witness | |||
There was a problem hiding this comment.
A comment here would be nice
| getSelfTypeAndConformanceForWitness(SILDeclRef witness, SubstitutionMap subs) { | ||
| auto protocol = cast<ProtocolDecl>(witness.getDecl()->getDeclContext()); | ||
| auto selfParam = protocol->getProtocolSelfType()->getCanonicalType(); | ||
| auto type = subs.getReplacementTypes()[0]; |
There was a problem hiding this comment.
I think selfParam.subst(subs) is more robust
| auto origWitnessFTy = getWitnessFunctionType(SGM, witness, witnessKind); | ||
| auto witnessFTy = origWitnessFTy; | ||
| if (!witnessSubs.empty()) | ||
| witnessFTy = origWitnessFTy->substGenericArgs(SGM.M, witnessSubs); |
There was a problem hiding this comment.
You don't have to check if the subs are non-empty here
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.
5.0 version of #20629. Includes the patches from #20658 and #20662.
ABI-additive: the stdlib exports some extra symbols. Not specifically important for convergence, but eventually necessary in order to implement SE-0235 in Swift 5.0.