Test

Author: jketema

swift/extractor/mangler/SwiftMangler.cpp

@@ -19,43 +19,6 @@ Logger& logger() {
   return ret;
 }
 
-const swift::ModuleDecl* getRealModuleOf(const swift::Decl* decl) {
-  auto* swiftModule = decl->getModuleContext();
-  auto* clangModule = swiftModule->findUnderlyingClangModule();
-
-  if (!clangModule) {
-    return swiftModule;
-  }
-
-  auto* clangModuleLoader = decl->getASTContext().getClangModuleLoader();
-
-  if (!clangModuleLoader) {
-    return swiftModule;
-  }
-
-  static std::unordered_map<const swift::Decl*, const swift::ModuleDecl*> cache;
-
-  if (auto result = cache.find(decl); result != cache.end()) {
-    return result->second;
-  }
-
-  for (const auto& submodule : clangModule->submodules()) {
-    if (auto* swiftSubmodule = clangModuleLoader->getWrapperForModule(submodule)) {
-      llvm::SmallVector<swift::Decl*> children;
-      swiftSubmodule->getTopLevelDecls(children);
-      for (const auto child : children) {
-        cache[child] = swiftSubmodule;
-      }
-    }
-  }
-
-  if (auto result = cache.find(decl); result != cache.end()) {
-    return result->second;
-  } else {
-    return swiftModule;
-  }
-}
-
 const swift::Decl* getParent(const swift::Decl* decl) {
   auto context = decl->getDeclContext();
   if (context->getContextKind() == swift::DeclContextKind::FileUnit) {
@@ -151,11 +114,13 @@ unsigned SwiftMangler::getExtensionIndex(const swift::ExtensionDecl* decl,
   if (auto found = preloadedExtensionIndexes.extract(decl)) {
     return found.mapped();
   }
-  if (llvm::isa<swift::ModuleDecl>(parent)) {
-    auto* parentModule = getRealModuleOf(decl);
+  if (const auto* parentModule = llvm::dyn_cast<swift::ModuleDecl>(parent)) {
     llvm::SmallVector<swift::Decl*> siblings;
     parentModule->getTopLevelDecls(siblings);
     indexExtensions(siblings);
+    if (const auto* clangModule = parentModule->findUnderlyingClangModule()) {
+      indexClangExtensions(clangModule, decl->getASTContext().getClangModuleLoader());
+    }
   } else if (auto iterableParent = llvm::dyn_cast<swift::IterableDeclContext>(parent)) {
     indexExtensions(iterableParent->getAllMembers());
   } else {
@@ -173,8 +138,31 @@ void SwiftMangler::indexExtensions(llvm::ArrayRef<swift::Decl*> siblings) {
   for (auto sibling : siblings) {
     if (sibling->getKind() == swift::DeclKind::Extension) {
       preloadedExtensionIndexes.emplace(sibling, index);
+      index += 3u;
+    }
+  }
+}
+
+void SwiftMangler::indexClangExtensions(const clang::Module* clangModule,
+                                        swift::ClangModuleLoader* moduleLoader) {
+  if (!moduleLoader) {
+    return;
+  }
+
+  auto submoduleIndex = 5u;
+  for (const auto& submodule : clangModule->submodules()) {
+    auto index = submoduleIndex;
+    if (auto* swiftSubmodule = moduleLoader->getWrapperForModule(submodule)) {
+      llvm::SmallVector<swift::Decl*> children;
+      swiftSubmodule->getTopLevelDecls(children);
+      for (const auto child : children) {
+        if (child->getKind() == swift::DeclKind::Extension) {
+          preloadedExtensionIndexes.emplace(child, index);
+          index += 7u;
+        }
+      }
     }
-    ++index;
+    submoduleIndex += 5u;
   }
 }
 

swift/extractor/mangler/SwiftMangler.h

@@ -113,6 +113,8 @@ class SwiftMangler : private swift::TypeVisitor<SwiftMangler, SwiftMangledName>,
   SwiftMangledName fetch(swift::Type type) { return fetch(type.getPointer()); }
 
   void indexExtensions(llvm::ArrayRef<swift::Decl*> siblings);
+  void indexClangExtensions(const clang::Module* clangModule,
+                            swift::ClangModuleLoader* moduleLoader);
   unsigned int getExtensionIndex(const swift::ExtensionDecl* decl, const swift::Decl* parent);
   static SwiftMangledName initMangled(const swift::TypeBase* type);
   SwiftMangledName initMangled(const swift::Decl* decl);