Merge pull request #2772 from CodaFi/inner-turmoil

Author: swift-ci

lib/AST/Decl.cpp

@@ -4600,11 +4600,18 @@ ConstructorDecl::getDelegatingOrChainedInitKind(DiagnosticEngine *diags,
       return false;
     }
 
+    bool walkToDeclPre(class Decl *D) override {
+      // Don't walk into further nominal decls.
+      if (isa<NominalTypeDecl>(D))
+        return false;
+      return true;
+    }
+    
     std::pair<bool, Expr*> walkToExprPre(Expr *E) override {
       // Don't walk into closures.
       if (isa<ClosureExpr>(E))
         return { false, E };
-
+      
       // Look for calls of a constructor on self or super.
       auto apply = dyn_cast<ApplyExpr>(E);
       if (!apply)
@@ -4676,7 +4683,7 @@ ConstructorDecl::getDelegatingOrChainedInitKind(DiagnosticEngine *diags,
   if (Kind == BodyInitKind::None && getAttrs().hasAttribute<ConvenienceAttr>())
     Kind = BodyInitKind::Delegating;
 
-  // If wes till don't know, check whether we have a class with a superclass: it
+  // If we still don't know, check whether we have a class with a superclass: it
   // gets an implicit chained initializer.
   if (Kind == BodyInitKind::None) {
     if (auto classDecl = getDeclContext()->getAsClassOrClassExtensionContext()) {

test/decl/class/constructor_search_outer.swift

@@ -0,0 +1,45 @@
+// RUN: %target-parse-verify-swift
+
+class A {
+  init() {}
+}
+
+class B {
+  init() {}
+    
+  convenience init(x: ()) {
+    class C: A {
+      override init() { // No error
+        super.init()
+      }
+    }
+      
+    class D: A {
+      convenience init(x: ()) {
+        class DI : A {
+          override init() { // No error
+            super.init()
+          }
+        }
+
+        self.init()
+      }
+
+      override init() { // No error
+        class DI : A {
+          override init() { // No error
+            super.init()
+          }
+        }
+        super.init()
+      }
+    }
+
+    struct E {
+      init() {} // No error
+    }
+ 
+    self.init()
+  }
+}
+