Merge pull request #8043 from slavapestov/fix-constructor-lookup-circularity

Sema: Fix crash if we try to look up constructors while validating a constructor

Author: slavapestov

lib/Sema/TypeCheckDecl.cpp

@@ -7915,6 +7915,19 @@ void TypeChecker::addImplicitConstructors(NominalTypeDecl *decl) {
     return paramTy->getCanonicalType();
   };
 
+  // Bail out if we're validating one of our constructors already; we'll
+  // revisit the issue later.
+  bool alreadyValidatingCtor = false;
+  for (auto member : decl->getMembers()) {
+    if (auto ctor = dyn_cast<ConstructorDecl>(member)) {
+      validateDecl(ctor);
+      if (!ctor->hasValidSignature())
+        alreadyValidatingCtor = true;
+    }
+  }
+  if (alreadyValidatingCtor)
+    return;
+
   // Check whether there is a user-declared constructor or an instance
   // variable.
   bool FoundMemberwiseInitializedProperty = false;
@@ -7926,8 +7939,6 @@ void TypeChecker::addImplicitConstructors(NominalTypeDecl *decl) {
   llvm::SmallPtrSet<ConstructorDecl *, 4> overriddenInits;
   for (auto member : decl->getMembers()) {
     if (auto ctor = dyn_cast<ConstructorDecl>(member)) {
-      validateDecl(ctor);
-
       if (ctor->isDesignatedInit())
         FoundDesignatedInit = true;
 

validation-test/compiler_crashers_2_fixed/0081-rdar30751491.swift

@@ -0,0 +1,7 @@
+// RUN: not %target-swift-frontend %s -typecheck -o /dev/null
+
+class FakeDictionary<KeyType, ValueType> : ExpressibleByDictionaryLiteral {
+  convenience required init(dictionaryLiteral elements: (FakeDictionary.Key, FakeDictionary.Value)...) {
+    self.init()
+  }
+}