Merge pull request #72094 from beccadax/objcimpl-generated-header-override

Author: beccadax

lib/PrintAsClang/DeclAndTypePrinter.cpp

@@ -2845,7 +2845,7 @@ static bool excludeForObjCImplementation(const ValueDecl *VD) {
     return true;
   // Exclude overrides in an @_objcImplementation extension; the decl they're
   // overriding is declared elsewhere.
-  if (VD->isImplicit() && VD->getOverriddenDecl()) {
+  if (VD->getOverriddenDecl()) {
     auto ED = dyn_cast<ExtensionDecl>(VD->getDeclContext());
     if (ED && ED->isObjCImplementation())
       return true;

test/PrintAsObjC/Inputs/custom-modules/objc_implementation/objc_implementation.h

@@ -6,4 +6,8 @@
 
 @end
 
+@interface ObjCClass2 : NSObject
+
+@end
+
 void CImplFunc(void);

test/PrintAsObjC/objc_implementation.swift

@@ -30,11 +30,18 @@ extension ObjCClass {
   // Implicit `override init()` to override superclass
 
   // NEGATIVE-NOT: )swiftMethod{{ }}
-  @objc func swiftMethod() -> Any? { nil }
+  @objc public func swiftMethod() -> Any? { nil }
 
   // NEGATIVE-NOT: )privateMethod{{ }}
   @objc private func privateMethod() -> Any? { nil }
 }
 
+// Has no contents that need to be printed
+// NEGATIVE-NOT: ObjCClass2
+@_objcImplementation extension ObjCClass2 {
+  // NEGATIVE-NOT: )init{{ }}
+  public override init() { }
+}
+
 @_cdecl("CImplFunc") @_objcImplementation func CImplFunc() {}
 // NEGATIVE-NOT: CImplFunc(