averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26536 from theblixguy/fix/SR-10198

Browse Source 
[Typechecker] Check for generic signature when matching overrides
This commit is contained in:
Slava Pestov
2019-08-09 15:55:12 -04:00
committed by GitHub
parent 60fa323b6e 31153984ff
commit 15a8619621
3 changed files with 52 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/AST/ASTContext.cpp
View File

@@ -4408,6 +4408,7 @@ GenericSignature *
ASTContext::getOverrideGenericSignature(const ValueDecl *base,
const ValueDecl *derived) {
auto baseGenericCtx = base->getAsGenericContext();
auto derivedGenericCtx = derived->getAsGenericContext();
auto &ctx = base->getASTContext();
if (!baseGenericCtx) {
@@ -4431,6 +4432,10 @@ ASTContext::getOverrideGenericSignature(const ValueDecl *base,
return nullptr;
}
if (!derivedGenericCtx || !derivedGenericCtx->isGeneric()) {
return nullptr;
}
if (derivedClass->getGenericSignature() == nullptr &&
!baseGenericCtx->isGeneric()) {
return nullptr;
@@ -4459,12 +4464,8 @@ ASTContext::getOverrideGenericSignature(const ValueDecl *base,
GenericSignatureBuilder builder(ctx);
builder.addGenericSignature(derivedClass->getGenericSignature());
if (auto derivedGenericCtx = derived->getAsGenericContext()) {
if (derivedGenericCtx->isGeneric()) {
for (auto param : *derivedGenericCtx->getGenericParams()) {
builder.addGenericParameter(param);
}
}
for (auto param : *derivedGenericCtx->getGenericParams()) {
builder.addGenericParameter(param);
}
auto source =