Merge pull request #33620 from CodaFi/a-look-alike

Author: swift-ci

lib/Sema/TypeCheckStmt.cpp

@@ -1764,9 +1764,9 @@ static bool checkSuperInit(ConstructorDecl *fromCtor,
     NLOptions subOptions = NL_QualifiedDefault | NL_KnownNonCascadingDependency;
 
     SmallVector<ValueDecl *, 4> lookupResults;
-    dc->lookupQualified(superclassDecl,
-                        DeclNameRef::createConstructor(),
-                        subOptions, lookupResults);
+    fromCtor->lookupQualified(superclassDecl,
+                              DeclNameRef::createConstructor(),
+                              subOptions, lookupResults);
 
     for (auto decl : lookupResults) {
       auto superclassCtor = dyn_cast<ConstructorDecl>(decl);

test/SILOptimizer/Inputs/definite_init_cross_module/OtherModule.swift

@@ -41,3 +41,14 @@ public struct Empty {
 public struct GenericEmpty<T> {
   public init() {}
 }
+
+open class VisibleNoArgsDesignatedInit {
+  var x: Float
+  public init() { x = 0.0 }
+
+  // Add some designated inits the subclass cannot see.
+  private init(x: Float) { self.x = x }
+  fileprivate init(y: Float) { self.x = y }
+  internal init(z: Float) { self.x = z }
+}
+

test/SILOptimizer/definite_init_cross_module.swift

@@ -254,3 +254,27 @@ extension GenericEmpty {
   init(xx: Double) {
   } // expected-error {{'self.init' isn't called on all paths before returning from initializer}}
 }
+
+class AcceptsVisibleNoArgsDesignatedInit: VisibleNoArgsDesignatedInit {
+  var y: Float
+  init(y: Float) {
+    self.y = y
+    // no error
+  }
+}
+
+open class InModuleVisibleNoArgsDesignatedInit {
+  var x: Float
+  public init() { x = 0.0 }
+
+  // Add a designated init the subclass cannot see.
+  private init(x: Float) { self.x = x }
+}
+
+class AcceptsInModuleVisibleNoArgsDesignatedInit: InModuleVisibleNoArgsDesignatedInit {
+  var y: Float
+  init(y: Float) {
+    self.y = y
+    // no error
+  }
+}