Merge pull request #63296 from hyp/eng/print-ns-interface-quick

[interop] AST printer should only visit one original namespace decl t…

Author: hyp

include/swift/AST/ASTPrinter.h

@@ -28,6 +28,10 @@
 // ambiguities with type names, in AliasModuleNames mode.
 #define MODULE_DISAMBIGUATING_PREFIX "Module___"
 
+namespace clang {
+class Decl;
+}
+
 namespace swift {
   class Decl;
   class DeclContext;
@@ -111,6 +115,7 @@ class ASTPrinter {
   unsigned CurrentIndentation = 0;
   unsigned PendingNewlines = 0;
   TypeOrExtensionDecl SynthesizeTarget;
+  llvm::SmallPtrSet<const clang::Decl *, 8> printedClangDecl;
 
   void printTextImpl(StringRef Text);
 
@@ -331,6 +336,12 @@ class ASTPrinter {
     printStructurePre(Kind, D);
   }
 
+  /// Return true when the given redeclared clang decl is being printed for the
+  /// first time.
+  bool shouldPrintRedeclaredClangDecl(const clang::Decl *d) {
+    return printedClangDecl.insert(d).second;
+  }
+
 private:
   virtual void anchor();
 };

lib/AST/ASTPrinter.cpp

@@ -14,8 +14,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "InlinableText.h"
 #include "swift/AST/ASTPrinter.h"
+#include "InlinableText.h"
 #include "swift/AST/ASTContext.h"
 #include "swift/AST/ASTMangler.h"
 #include "swift/AST/ASTVisitor.h"
@@ -61,6 +61,7 @@
 #include "clang/AST/DeclObjC.h"
 #include "clang/Basic/Module.h"
 #include "clang/Basic/SourceManager.h"
+#include "clang/Lex/MacroInfo.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Support/Compiler.h"
@@ -2299,7 +2300,15 @@ static void addNamespaceMembers(Decl *decl,
 
   // This is only to keep track of the members we've already seen.
   llvm::SmallPtrSet<Decl *, 16> addedMembers;
+  const auto *declOwner = namespaceDecl->getOwningModule();
+  if (declOwner)
+    declOwner = declOwner->getTopLevelModule();
   for (auto redecl : namespaceDecl->redecls()) {
+    // Skip namespace declarations that come from other top-level modules.
+    if (const auto *redeclOwner = redecl->getOwningModule()) {
+      if (declOwner && declOwner != redeclOwner->getTopLevelModule())
+        continue;
+    }
     for (auto member : redecl->decls()) {
       if (auto classTemplate = dyn_cast<clang::ClassTemplateDecl>(member)) {
         // Add all specializations to a worklist so we don't accidently mutate
@@ -2323,10 +2332,16 @@ static void addNamespaceMembers(Decl *decl,
       if (!name)
         continue;
 
-      CXXNamespaceMemberLookup lookupRequest({cast<EnumDecl>(decl), name});
-      for (auto found : evaluateOrDefault(ctx.evaluator, lookupRequest, {})) {
-        if (addedMembers.insert(found).second)
-          members.push_back(found);
+      auto allResults = evaluateOrDefault(
+          ctx.evaluator, ClangDirectLookupRequest({decl, redecl, name}), {});
+
+      for (auto found : allResults) {
+        auto clangMember = found.get<clang::NamedDecl *>();
+        if (auto importedDecl =
+                ctx.getClangModuleLoader()->importDeclDirectly(clangMember)) {
+          if (addedMembers.insert(importedDecl).second)
+            members.push_back(importedDecl);
+        }
       }
     }
   }
@@ -3593,6 +3608,13 @@ void PrintAST::visitAssociatedTypeDecl(AssociatedTypeDecl *decl) {
 }
 
 void PrintAST::visitEnumDecl(EnumDecl *decl) {
+  if (const auto *namespaceDecl =
+          dyn_cast_or_null<clang::NamespaceDecl>(decl->getClangDecl())) {
+    // Enum that correponds to the C++ namespace should only be printed once.
+    if (!Printer.shouldPrintRedeclaredClangDecl(
+            namespaceDecl->getOriginalNamespace()))
+      return;
+  }
   printDocumentationComment(decl);
   printAttributes(decl);
   printAccess(decl);

test/Interop/Cxx/namespace/cross-module-redecls-module-interface.swift

@@ -0,0 +1,49 @@
+// RUN: rm -rf %t
+// RUN: split-file %s %t
+// RUN: %target-swift-ide-test -print-module -module-to-print=ModuleB -I %t/Inputs -source-filename=x -enable-experimental-cxx-interop | %FileCheck --check-prefix=CHECKB %s
+// RUN: %target-swift-ide-test -print-module -module-to-print=ModuleA -I %t/Inputs -source-filename=x -enable-experimental-cxx-interop | %FileCheck --check-prefix=CHECKA %s
+
+//--- Inputs/module.modulemap
+module ModuleA {
+    header "headerA.h"
+    requires cplusplus
+}
+
+module ModuleB {
+    header "headerB.h"
+    requires cplusplus
+}
+
+//--- Inputs/headerA.h
+
+namespace ns {
+    struct A {
+        int x;
+    };
+}
+
+//--- Inputs/headerB.h
+
+#include "headerA.h"
+
+namespace ns {
+    struct B {
+        int y;
+    };
+}
+
+// CHECKB:     enum ns {
+// CHECKB-NEXT: struct B {
+// CHECKB-NEXT:    init()
+// CHECKB-NEXT:    init(y: Int32)
+// CHECKB-NEXT:    var y: Int32
+// CHECKB-NEXT:  }
+// CHECKB-NEXT: }
+
+// CHECKA:     enum ns {
+// CHECKA-NEXT: struct A {
+// CHECKA-NEXT:    init()
+// CHECKA-NEXT:    init(x: Int32)
+// CHECKA-NEXT:    var x: Int32
+// CHECKA-NEXT:  }
+// CHECKA-NEXT: }

test/Interop/Cxx/stdlib/print-libcxx-module-interface.swift

@@ -0,0 +1,11 @@
+// RUN: %target-swift-ide-test -print-module -module-to-print=CxxStdlib -source-filename=x -enable-experimental-cxx-interop -enable-objc-interop -module-print-submodules | %FileCheck %s
+
+// REQUIRES: OS=macosx
+// REQUIRES: libcxx-in-sdk
+
+// CHECK: enum std {
+// CHECK-NEXT: enum __1 {
+
+// CHECK: typealias string =
+
+// CHECK-NOT: enum std

test/Interop/lit.local.cfg

@@ -12,6 +12,11 @@ clang_opt = clang_compile_opt
 is_cf_options_interop_updated = True
 
 if config.variant_sdk and config.variant_sdk != "":
+    # Check if libc++ is present in the SDK or not.
+    if config.target_sdk_libcxx_path and os.path.exists(config.target_sdk_libcxx_path):
+        config.available_features.add('libcxx-in-sdk')
+        config.substitutions.insert(0, ('%libcxx-in-sdk-path', config.target_sdk_libcxx_path))
+
     # Check if CF_OPTIONS macro has been updated to be imported into Swift in C++ mode correctly.
     cf_avail_path = os.path.join(config.variant_sdk, 'System', 'Library', 'Frameworks', 'CoreFoundation.framework', 'Versions', 'A', 'Headers', 'CFAvailability.h')
     if os.path.exists(cf_avail_path):