Merge pull request #6186 from slavapestov/itc-fix-2

Sema: More ITC fixes

Author: slavapestov

lib/AST/Decl.cpp

@@ -2404,6 +2404,10 @@ ObjCClassKind ClassDecl::checkObjCAncestry() const {
     if (!CD->hasSuperclass())
       break;
     CD = CD->getSuperclass()->getClassOrBoundGenericClass();
+    // If we don't have a valid class here, we should have diagnosed
+    // elsewhere.
+    if (!CD)
+      break;
   }
 
   if (!isObjC)

lib/Sema/ITCNameLookup.cpp

@@ -75,6 +75,10 @@ bool IterativeTypeChecker::isQualifiedLookupInDeclContextSatisfied(
 
     if (auto superclass = classDecl->getSuperclass()) {
       if (auto superclassDecl = superclass->getAnyNominal()) {
+        // Hack.
+        if (superclassDecl == nominal)
+          return true;
+
         if (!isSatisfied(requestQualifiedLookupInDeclContext({ superclassDecl,
                                                                payload.Name,
                                                                payload.Loc })))

lib/Sema/TypeCheckDecl.cpp

@@ -560,8 +560,6 @@ void TypeChecker::checkInheritanceClause(Decl *decl,
   // Set the superclass.
   if (auto classDecl = dyn_cast<ClassDecl>(decl)) {
     classDecl->setSuperclass(superclassTy);
-    if (superclassTy)
-      resolveImplicitConstructors(superclassTy->getClassOrBoundGenericClass());
   } else if (auto enumDecl = dyn_cast<EnumDecl>(decl)) {
     enumDecl->setRawType(superclassTy);
   } else {
@@ -7859,10 +7857,6 @@ void TypeChecker::addImplicitConstructors(NominalTypeDecl *decl) {
   // for all of the superclass's designated initializers.
   // FIXME: Currently skipping generic classes.
   auto classDecl = cast<ClassDecl>(decl);
-  assert(!classDecl->hasSuperclass() ||
-         classDecl->getSuperclass()->getAnyNominal()->isInvalid() ||
-         classDecl->getSuperclass()->getAnyNominal()
-           ->addedImplicitInitializers());
   if (classDecl->hasSuperclass()) {
     bool canInheritInitializers = !FoundDesignatedInit;
 
@@ -7874,6 +7868,11 @@ void TypeChecker::addImplicitConstructors(NominalTypeDecl *decl) {
     }
 
     auto superclassTy = classDecl->getSuperclass();
+    auto *superclassDecl = superclassTy->getClassOrBoundGenericClass();
+    assert(superclassDecl && "Superclass of class is not a class?");
+    if (!superclassDecl->addedImplicitInitializers())
+      addImplicitConstructors(superclassDecl);
+
     auto ctors = lookupConstructors(classDecl, superclassTy,
                                     NameLookupFlags::IgnoreAccessibility);
 

test/SILGen/accessibility_vtables.swift

@@ -38,10 +38,10 @@ class InternalSub : InternalBase {
 
 // CHECK-LABEL: sil_vtable InternalSub {
 // CHECK-NEXT:  #InternalBase.method!1: _TFC21accessibility_vtables12InternalBaseP{{[0-9]+}}[[DISCRIMINATOR:_.+]]6method
-// CHECK-NEXT:  #InternalBase.init!initializer.1: _TFC21accessibility_vtables11InternalSubc
 // CHECK-NEXT:  #InternalBase.prop!getter.1: _TFC21accessibility_vtables11InternalSubg4propSi // accessibility_vtables.InternalSub.prop.getter : Swift.Int
 // CHECK-NEXT:  #InternalBase.prop!setter.1: _TFC21accessibility_vtables12InternalBases4propSi        // accessibility_vtables.InternalBase.prop.setter : Swift.Int
 // CHECK-NEXT:  #InternalBase.prop!materializeForSet.1: _TFC21accessibility_vtables12InternalBasem4propSi // accessibility_vtables.InternalBase.prop.materializeForSet : Swift.Int
+// CHECK-NEXT:  #InternalBase.init!initializer.1: _TFC21accessibility_vtables11InternalSubc
 // CHECK-NEXT:  #InternalSub.method!1: _TFC21accessibility_vtables11InternalSub6method
 // CHECK-NEXT:  #InternalSub.prop!setter.1: _TFC21accessibility_vtables11InternalSubs4propSi  // accessibility_vtables.InternalSub.prop.setter : Swift.Int
 // CHECK-NEXT:  #InternalSub.prop!materializeForSet.1: _TFC21accessibility_vtables11InternalSubm4propSi // accessibility_vtables.InternalSub.prop.materializeForSet : Swift.Int

test/SILGen/objc_attr_NSManaged.swift

@@ -99,11 +99,11 @@ extension ProtoAdopter {
 
 // The vtable should not contain any entry points for getters and setters.
 // CHECK-LABEL: sil_vtable SwiftGizmo {
-// CHECK-NEXT: #SwiftGizmo.modifyX!1: _TFC19objc_attr_NSManaged10SwiftGizmo7modifyX
-// CHECK-NEXT: #SwiftGizmo.testFunc!1: _TFC19objc_attr_NSManaged10SwiftGizmo8testFunc
-// CHECK-NEXT:  #SwiftGizmo.init!initializer.1: _TFC19objc_attr_NSManaged10SwiftGizmoc
+// CHECK-NEXT:   #SwiftGizmo.modifyX!1: _TFC19objc_attr_NSManaged10SwiftGizmo7modifyX
+// CHECK-NEXT:   #SwiftGizmo.testFunc!1: _TFC19objc_attr_NSManaged10SwiftGizmo8testFunc
+// CHECK-NEXT:   #SwiftGizmo.deinit!deallocator:
+// CHECK-NEXT:   #SwiftGizmo.init!initializer.1: _TFC19objc_attr_NSManaged10SwiftGizmoc
 // CHECK-NEXT:   #SwiftGizmo.init!initializer.1: _TFC19objc_attr_NSManaged10SwiftGizmoc
-// CHECK-NEXT:  #SwiftGizmo.deinit!deallocator:
 // CHECK-NEXT: }
 
 // CHECK-LABEL: sil_vtable FinalGizmo {

test/decl/class/circular_inheritance.swift

@@ -10,7 +10,8 @@ protocol P : P {} // expected-error{{circular protocol inheritance P}}
 class Isomorphism : Automorphism { }
 class Automorphism : Automorphism { } // expected-error{{circular class inheritance Automorphism}}
 
-let _ = A()
+// FIXME: Useless error
+let _ = A() // expected-error{{'A' cannot be constructed because it has no accessible initializers}}
 
 // This should probably be made to work, but for now test that it produces a crappy
 // diagnostic instead of crashing

validation-test/compiler_crashers/28367-swift-declcontext-isgenericcontext.swift renamed to validation-test/compiler_crashers_fixed/28367-swift-declcontext-isgenericcontext.swift

@@ -5,5 +5,5 @@
 // See https://swift.org/LICENSE.txt for license information
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
-// RUN: not --crash %target-swift-frontend %s -typecheck
+// RUN: not %target-swift-frontend %s -typecheck
 let a{{}protocol A{class A:d class d<U:A>:A

validation-test/compiler_crashers/28386-swift-typebase-getdesugaredtype.swift renamed to validation-test/compiler_crashers_fixed/28386-swift-typebase-getdesugaredtype.swift

@@ -5,7 +5,7 @@
 // See https://swift.org/LICENSE.txt for license information
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
-// RUN: not --crash %target-swift-frontend %s -typecheck
+// RUN: not %target-swift-frontend %s -typecheck
 struct A{init(){let:A
 class B:A
 class A:B{

validation-test/compiler_crashers/28455-type-hastypeparameter-type-haserror-not-fully-substituted-failed.swift renamed to validation-test/compiler_crashers_fixed/28455-type-hastypeparameter-type-haserror-not-fully-substituted-failed.swift

@@ -5,7 +5,7 @@
 // See https://swift.org/LICENSE.txt for license information
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
-// RUN: not --crash %target-swift-frontend %s -emit-ir
+// RUN: not %target-swift-frontend %s -emit-ir
 // REQUIRES: asserts
 protocol A{enum S{var f=e
 typealias f:B

validation-test/compiler_crashers/28462-segfault-0xcdc361-0xd051ef-0xcdc361-0xd051ef.swift renamed to validation-test/compiler_crashers_fixed/28462-segfault-0xcdc361-0xd051ef-0xcdc361-0xd051ef.swift

@@ -5,5 +5,5 @@
 // See https://swift.org/LICENSE.txt for license information
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
-// RUN: not --crash %target-swift-frontend %s -emit-ir
+// RUN: not %target-swift-frontend %s -emit-ir
 typealias e=A.G{}{}class A:A

validation-test/compiler_crashers/28506-swift-iterativetypechecker-issatisfied-swift-typecheckrequest.swift renamed to validation-test/compiler_crashers_fixed/28506-swift-iterativetypechecker-issatisfied-swift-typecheckrequest.swift

@@ -5,5 +5,5 @@
 // See https://swift.org/LICENSE.txt for license information
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
-// RUN: not --crash %target-swift-frontend %s -emit-ir
+// RUN: not %target-swift-frontend %s -emit-ir
 typealias e:A.d)class A:A}a

validation-test/compiler_crashers/28524-swift-iterativetypechecker-issatisfied-swift-typecheckrequest.swift renamed to validation-test/compiler_crashers_fixed/28524-swift-iterativetypechecker-issatisfied-swift-typecheckrequest.swift

@@ -5,6 +5,6 @@
 // See https://swift.org/LICENSE.txt for license information
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
-// RUN: not --crash %target-swift-frontend %s -emit-ir
+// RUN: not %target-swift-frontend %s -emit-ir
 typealias d:A.a
 class A:A