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

Provide a fix for SR-1571 (#2854)

Browse Source 
Lookup can occasionally produce a call to a superclass constructor here that is not in our immediate superclass and we would trust it was completely valid. Instead, reject the notion of creating such a constructor entirely unless its decl can prove it is actually in our superclass.
This commit is contained in:
Robert Widmann
2016-06-03 18:00:08 -07:00
committed by Jordan Rose
parent 4956ba63e5
commit 8f3031d7b9
2 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Sema/CodeSynthesis.cpp
View File

@@ -2048,6 +2048,21 @@ swift::createDesignatedInitOverride(TypeChecker &tc,
if (superclassCtor->getGenericParams())
return nullptr;
// Lookup will sometimes give us initializers that are from the ancestors of
// our immediate superclass. So, from the superclass constructor, we look
// one level up to the enclosing type context which will either be a class
// or an extension. We can use the type declared in that context to check
// if it's our immediate superclass and give up if we didn't.
//
// FIXME: Remove this when lookup of initializers becomes restricted to our
// immediate superclass.
Type superclassTyInCtor = superclassCtor->getDeclContext()->getDeclaredTypeInContext();
Type superclassTy = classDecl->getSuperclass();
NominalTypeDecl *superclassDecl = superclassTy->getAnyNominal();
if (superclassTyInCtor->getAnyNominal() != superclassDecl) {
return nullptr;
}
// Determine the initializer parameters.
auto &ctx = tc.Context;
@@ -2064,8 +2079,6 @@ swift::createDesignatedInitOverride(TypeChecker &tc,
//
// We might have to apply substitutions, if for example we have a declaration
// like 'class A : B<Int>'.
auto superclassTy = classDecl->getSuperclass();
auto *superclassDecl = superclassTy->getAnyNominal();
if (superclassDecl->isGenericTypeContext()) {
if (auto *superclassSig = superclassDecl->getGenericSignatureOfContext()) {
auto *moduleDecl = classDecl->getParentModule();