Merge pull request #30306 from xymus/print-objc-ext

[PrintAsObjC] Don't print imports for empty extensions

Author: xymus

lib/PrintAsObjC/DeclAndTypePrinter.cpp

@@ -155,6 +155,25 @@ class DeclAndTypePrinter::Implementation
     return owningPrinter.shouldInclude(VD);
   }
 
+  bool isEmptyExtensionDecl(const ExtensionDecl *ED) {
+    auto members = ED->getMembers();
+    auto hasMembers = std::any_of(members.begin(), members.end(),
+                                  [this](const Decl *D) -> bool {
+      if (auto VD = dyn_cast<ValueDecl>(D))
+        if (shouldInclude(VD))
+          return true;
+      return false;
+    });
+
+    auto protocols = ED->getLocalProtocols(ConformanceLookupKind::OnlyExplicit);
+    auto hasProtocols = std::any_of(protocols.begin(), protocols.end(),
+                                    [this](const ProtocolDecl *PD) -> bool {
+      return shouldInclude(PD);
+    });
+
+    return (!hasMembers && !hasProtocols);
+  }
+
 private:
   /// Prints a protocol adoption list: <code>&lt;NSCoding, NSCopying&gt;</code>
   ///
@@ -311,25 +330,6 @@ class DeclAndTypePrinter::Implementation
     os << "@end\n";
   }
 
-  bool isEmptyExtensionDecl(ExtensionDecl *ED) {
-    auto members = ED->getMembers();
-    auto hasMembers = std::any_of(members.begin(), members.end(),
-                                  [this](const Decl *D) -> bool {
-      if (auto VD = dyn_cast<ValueDecl>(D))
-        if (shouldInclude(VD))
-          return true;
-      return false;
-    });
-
-    auto protocols = ED->getLocalProtocols(ConformanceLookupKind::OnlyExplicit);
-    auto hasProtocols = std::any_of(protocols.begin(), protocols.end(),
-                                    [this](const ProtocolDecl *PD) -> bool {
-      return shouldInclude(PD);
-    });
-
-    return (!hasMembers && !hasProtocols);
-  }
-
   void visitExtensionDecl(ExtensionDecl *ED) {
     if (isEmptyExtensionDecl(ED))
       return;
@@ -2063,6 +2063,10 @@ void DeclAndTypePrinter::printAdHocCategory(
   getImpl().printAdHocCategory(members);
 }
 
+bool DeclAndTypePrinter::isEmptyExtensionDecl(const ExtensionDecl *ED) {
+  return getImpl().isEmptyExtensionDecl(ED);
+}
+
 StringRef
 DeclAndTypePrinter::maybeGetOSObjectBaseName(const clang::NamedDecl *decl) {
   StringRef name = decl->getName();

lib/PrintAsObjC/DeclAndTypePrinter.h

@@ -70,6 +70,9 @@ class DeclAndTypePrinter {
   void print(const Decl *D);
   void print(Type ty);
 
+  /// Is \p ED empty of members and protocol conformances to include?
+  bool isEmptyExtensionDecl(const ExtensionDecl *ED);
+
   /// Prints a category declaring the given members.
   ///
   /// All members must have the same parent type. The list must not be empty.

lib/PrintAsObjC/ModuleContentsWriter.cpp

@@ -400,6 +400,9 @@ class ModuleWriter {
   }
 
   bool writeExtension(const ExtensionDecl *ED) {
+    if (printer.isEmptyExtensionDecl(ED))
+      return true;
+
     bool allRequirementsSatisfied = true;
 
     const ClassDecl *CD = ED->getSelfClassDecl();

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

@@ -3,3 +3,6 @@
 @interface NSObject (Secrets)
 - (void)secretMethod;
 @end
+
+@interface SecretClass : NSObject
+@end

test/PrintAsObjC/imports.swift

@@ -77,3 +77,7 @@ import MostlyPrivate2_Private
 @objc public class TestSubclass: NSObject {
   @_implementationOnly public override func secretMethod() {}
 }
+
+extension SecretClass {
+  private func somethingThatShouldNotBeIncluded() {}
+}