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

Sema: Diagnose invalid overrides involving contextual where clauses

Browse Source
This commit is contained in:
Anthony Latsis
2019-11-05 02:34:36 +03:00
parent f14604e225
commit db3f7081ec
2 changed files with 74 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/AST/ASTContext.cpp
View File

@@ -4470,19 +4470,22 @@ ASTContext::getOverrideGenericSignature(const ValueDecl *base,
assert(isa<AbstractFunctionDecl>(base) || isa<SubscriptDecl>(base));
assert(isa<AbstractFunctionDecl>(derived) || isa<SubscriptDecl>(derived));
auto baseClass = base->getDeclContext()->getSelfClassDecl();
auto derivedClass = derived->getDeclContext()->getSelfClassDecl();
const auto baseClass = base->getDeclContext()->getSelfClassDecl();
const auto derivedClass = derived->getDeclContext()->getSelfClassDecl();
assert(baseClass != nullptr);
assert(derivedClass != nullptr);
auto baseGenericSig = base->getAsGenericContext()->getGenericSignature();
auto derivedGenericSig = derived->getAsGenericContext()->getGenericSignature();
const auto baseGenericSig =
base->getAsGenericContext()->getGenericSignature();
const auto derivedGenericSig =
derived->getAsGenericContext()->getGenericSignature();
if (base == derived)
return derivedGenericSig;
if (derivedClass->getSuperclass().isNull())
const auto derivedSuperclass = derivedClass->getSuperclass();
if (derivedSuperclass.isNull())
return nullptr;
if (derivedGenericSig.isNull())
@@ -4491,12 +4494,6 @@ ASTContext::getOverrideGenericSignature(const ValueDecl *base,
if (baseGenericSig.isNull())
return derivedGenericSig;
auto baseClassSig = baseClass->getGenericSignature();
auto subMap = derivedClass->getSuperclass()->getContextSubstitutionMap(
derivedClass->getModuleContext(), baseClass);
unsigned derivedDepth = 0;
auto key = OverrideSignatureKey(baseGenericSig,
derivedGenericSig,
derivedClass);
@@ -4506,22 +4503,25 @@ ASTContext::getOverrideGenericSignature(const ValueDecl *base,
return getImpl().overrideSigCache.lookup(key);
}
if (auto derivedSig = derivedClass->getGenericSignature())
derivedDepth = derivedSig->getGenericParams().back()->getDepth() + 1;
const auto derivedClassSig = derivedClass->getGenericSignature();
unsigned derivedDepth = 0;
unsigned baseDepth = 0;
if (derivedClassSig)
derivedDepth = derivedClassSig->getGenericParams().back()->getDepth() + 1;
if (const auto baseClassSig = baseClass->getGenericSignature())
baseDepth = baseClassSig->getGenericParams().back()->getDepth() + 1;
SmallVector<GenericTypeParamType *, 2> addedGenericParams;
if (auto *gpList = derived->getAsGenericContext()->getGenericParams()) {
if (const auto *gpList = derived->getAsGenericContext()->getGenericParams()) {
for (auto gp : *gpList) {
addedGenericParams.push_back(
gp->getDeclaredInterfaceType()->castTo<GenericTypeParamType>());
}
}
unsigned baseDepth = 0;
if (baseClassSig) {
baseDepth = baseClassSig->getGenericParams().back()->getDepth() + 1;
}
const auto subMap = derivedSuperclass->getContextSubstitutionMap(
derivedClass->getModuleContext(), baseClass);
auto substFn = [&](SubstitutableType *type) -> Type {
auto *gp = cast<GenericTypeParamType>(type);
@@ -4553,7 +4553,7 @@ ASTContext::getOverrideGenericSignature(const ValueDecl *base,
auto genericSig = evaluateOrDefault(
evaluator,
AbstractGenericSignatureRequest{
derivedClass->getGenericSignature().getPointer(),
derivedClassSig.getPointer(),
std::move(addedGenericParams),
std::move(addedRequirements)},
GenericSignature());