Merge pull request #58543 from apple/egorzhdan/cxx-template-inst-lookup

[cxx-interop] Fix lookup of class template instantiations

Author: egorzhdan

lib/ClangImporter/ClangImporter.cpp

@@ -4330,9 +4330,15 @@ ClangDirectLookupRequest::evaluate(Evaluator &evaluator,
   if (auto spec = dyn_cast<clang::ClassTemplateSpecializationDecl>(clangDecl))
     return lookupInClassTemplateSpecialization(ctx, spec, desc.name);
 
-  auto *clangModule =
-      getClangOwningModule(clangDecl, clangDecl->getASTContext());
-  auto *lookupTable = ctx.getClangModuleLoader()->findLookupTable(clangModule);
+  SwiftLookupTable *lookupTable = nullptr;
+  if (isa<clang::NamespaceDecl>(clangDecl)) {
+    // DeclContext of a namespace imported into Swift is the __ObjC module.
+    lookupTable = ctx.getClangModuleLoader()->findLookupTable(nullptr);
+  } else {
+    auto *clangModule =
+        getClangOwningModule(clangDecl, clangDecl->getASTContext());
+    lookupTable = ctx.getClangModuleLoader()->findLookupTable(clangModule);
+  }
 
   auto foundDecls = lookupTable->lookup(
       SerializedSwiftName(desc.name.getBaseName()), EffectiveClangContext());

lib/ClangImporter/SwiftLookupTable.cpp

@@ -1922,6 +1922,30 @@ void importer::addEntryToLookupTable(SwiftLookupTable &table,
     }
   }
 
+  // Class template instantiations are imported lazily, however, the lookup
+  // table must include their mangled name (__CxxTemplateInst...) to make it
+  // possible to find these decls during deserialization. For any C++ typedef
+  // that defines a name for a class template instantiation (e.g. std::string),
+  // import the mangled name of this instantiation, and add it to the table.
+  if (auto typedefNameDecl = dyn_cast<clang::TypedefNameDecl>(named)) {
+    auto underlyingDecl = typedefNameDecl->getUnderlyingType()->getAsTagDecl();
+
+    if (auto specializationDecl =
+            dyn_cast_or_null<clang::ClassTemplateSpecializationDecl>(
+                underlyingDecl)) {
+      auto name = nameImporter.importName(specializationDecl, currentVersion);
+
+      // Avoid adding duplicate entries into the table.
+      auto existingEntries =
+          table.lookup(DeclBaseName(name.getDeclName().getBaseName()),
+                       name.getEffectiveContext());
+      if (existingEntries.empty()) {
+        table.addEntry(name.getDeclName(), specializationDecl,
+                       name.getEffectiveContext());
+      }
+    }
+  }
+
   // Walk the members of any context that can have nested members.
   if (isa<clang::TagDecl>(named) || isa<clang::ObjCInterfaceDecl>(named) ||
       isa<clang::ObjCProtocolDecl>(named) ||