Merge pull request #20119 from slavapestov/fix-some-crashers

Fix some crashers

Author: slavapestov

lib/AST/GenericSignatureBuilder.cpp

@@ -3875,6 +3875,12 @@ static Type resolveDependentMemberTypes(GenericSignatureBuilder &builder,
       if (equivClass->recursiveConcreteType)
         return ErrorType::get(Type(type));
 
+      // Prevent recursive substitution.
+      equivClass->recursiveConcreteType = true;
+      SWIFT_DEFER {
+        equivClass->recursiveConcreteType = false;
+      };
+
       return resolveDependentMemberTypes(builder, equivClass->concreteType);
     }
 

lib/Sema/TypeCheckDecl.cpp

@@ -3225,19 +3225,6 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
 
     TC.checkDeclAttributesEarly(ED);
 
-    if (auto extendedTy = ED->getExtendedType()) {
-      if (!extendedTy->is<NominalType>() &&
-          !extendedTy->is<BoundGenericType>() &&
-          !extendedTy->hasError()) {
-        // FIXME: Redundant diagnostic test here?
-        TC.diagnose(ED->getStartLoc(), diag::non_nominal_extension,
-                    extendedTy);
-        // FIXME: It would be nice to point out where we found the named type
-        // declaration, if any.
-        ED->setInvalid();
-      }
-    }
-
     checkInheritanceClause(ED);
 
     if (auto nominal = ED->getExtendedNominal()) {
@@ -3273,8 +3260,8 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
     // nominal type.
     // FIXME: This is a hack to make sure that the type checker precomputes
     // enough information for later passes that might query conformances.
-    if (auto nominal = ED->getSelfNominalTypeDecl())
-      (void)nominal->getAllConformances();
+    if (auto nominal = ED->getExtendedNominal())
+      (void) nominal->getAllConformances();
   }
 
   void visitTopLevelCodeDecl(TopLevelCodeDecl *TLCD) {

lib/Sema/TypeCheckType.cpp

@@ -149,6 +149,9 @@ Type TypeResolution::resolveDependentMemberType(
   }
 
   assert(stage == TypeResolutionStage::Interface);
+  if (!getGenericSignature())
+    return ErrorType::get(baseTy);
+
   auto builder = getGenericSignatureBuilder();
   auto baseEquivClass =
     builder->resolveEquivalenceClass(

test/decl/ext/generic.swift

@@ -167,3 +167,11 @@ public typealias Array2 = Array
 extension Array2 where QQQ : VVV {}
 // expected-error@-1 {{use of undeclared type 'QQQ'}}
 // expected-error@-2 {{use of undeclared type 'VVV'}}
+
+// https://bugs.swift.org/browse/SR-9009
+func foo() {
+  extension Array where Element : P1 {
+  // expected-error@-1 {{declaration is only valid at file scope}}
+    func foo() -> Element.AssocType {}
+  }
+}

validation-test/compiler_crashers_2_fixed/0180-sr9022.swift

@@ -0,0 +1,6 @@
+// RUN: not %target-swift-frontend -typecheck %s
+
+class Graph<V>: Collection {
+  typealias Iterator = AnyIterator<V>
+  typealias Index = Int
+}