Sema: Remove usages of getDeclaredTypeOfContext()

This commit is contained in:
Slava Pestov
2017-09-19 21:44:14 -07:00
parent 4773eacbef
commit 55916fa128
7 changed files with 15 additions and 13 deletions

View File

@@ -2040,11 +2040,13 @@ swift::createDesignatedInitOverride(TypeChecker &tc,
//
// FIXME: Remove this when lookup of initializers becomes restricted to our
// immediate superclass.
Type superclassTyInCtor = superclassCtor->getDeclContext()->getDeclaredTypeOfContext();
auto *superclassCtorDecl =
superclassCtor->getDeclContext()
->getAsNominalTypeOrNominalTypeExtensionContext();
Type superclassTy = classDecl->getSuperclass();
Type superclassTyInContext = classDecl->mapTypeIntoContext(superclassTy);
NominalTypeDecl *superclassDecl = superclassTy->getAnyNominal();
if (superclassTyInCtor->getAnyNominal() != superclassDecl) {
if (superclassCtorDecl != superclassDecl) {
return nullptr;
}