Merge pull request #61896 from apple/inits-on-a-milk-carton

Allow ObjC superclass to disable init inheritance

Author: swift-ci

lib/Sema/CodeSynthesis.cpp

@@ -1231,7 +1231,8 @@ InheritsSuperclassInitializersRequest::evaluate(Evaluator &eval,
 
   // If the superclass has known-missing designated initializers, inheriting
   // is unsafe.
-  if (superclassDecl->getModuleContext() != decl->getParentModule() &&
+  if ((superclassDecl->hasClangNode() ||
+       superclassDecl->getModuleContext() != decl->getParentModule()) &&
       superclassDecl->hasMissingDesignatedInitializers())
     return false;
 

test/ClangImporter/Inputs/custom-modules/ObjCParseExtras.h

@@ -260,3 +260,10 @@ struct TrivialToCopy {
 @interface SuperclassWithDesignatedInitInCategory ()
 -(instancetype) initWithI:(NSInteger)i __attribute__((objc_designated_initializer));
 @end
+
+__attribute__((swift_attr("@_hasMissingDesignatedInitializers")))
+@interface NoConvenienceInitInheritanceBase : NSObject
+@end
+
+@interface NoConvenienceInitInheritance : NoConvenienceInitInheritanceBase
+@end

test/ClangImporter/objc_init.swift

@@ -210,3 +210,14 @@ extension SuperclassWithDesignatedInitInCategory {
 func testConvenienceInitInheritance() {
   _ = SubclassWithSwiftPrivateDesignatedInit(y: 5)
 }
+
+// ...unless the superclass has been marked with
+// @_hasMissingDesignatedInitializers to disable this behavior.
+extension NoConvenienceInitInheritanceBase {
+  convenience init(y: Int) { self.init() }
+}
+
+func testNoConvenienceInitInheritance() {
+  _ = NoConvenienceInitInheritanceBase(y: 42)
+  _ = NoConvenienceInitInheritance(y: 42) // expected-error {{argument passed to call that takes no arguments}}
+}