Test

Author: jketema

swift/extractor/mangler/SwiftMangler.cpp

@@ -19,8 +19,6 @@ Logger& logger() {
   return ret;
 }
 
-std::unordered_map<const swift::Decl*, unsigned> preloadedExtensionIndexes;
-
 const swift::Decl* getParent(const swift::Decl* decl) {
   auto context = decl->getDeclContext();
   if (context->getContextKind() == swift::DeclContextKind::FileUnit) {
@@ -42,6 +40,8 @@ std::string_view getTypeKindStr(const swift::TypeBase* type) {
 
 }  // namespace
 
+std::unordered_map<const swift::Decl*, unsigned> SwiftMangler::preloadedExtensionIndexes;
+
 SwiftMangledName SwiftMangler::initMangled(const swift::TypeBase* type) {
   return {getTypeKindStr(type), '_'};
 }
@@ -113,38 +113,35 @@ unsigned SwiftMangler::getExtensionIndex(const swift::ExtensionDecl* decl,
   // indexes once for each encountered parent into the `preloadedExtensionIndexes` mapping.
   // Because we mangle declarations only once in a given trap/dispatcher context, we can safely
   // discard preloaded indexes on use
-  if (auto found = preloadedExtensionIndexes.find(decl); found != preloadedExtensionIndexes.end()) {
+  if (auto found = SwiftMangler::preloadedExtensionIndexes.find(decl);
+      found != SwiftMangler::preloadedExtensionIndexes.end()) {
     return found->second;
   }
   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()) {
-      fprintf(stderr, "\nXXX 1 %p\n", decl);
-      decl->dump();
       indexClangExtensions(clangModule, decl->getASTContext().getClangModuleLoader());
-      fprintf(stderr, "\nXXX 2\n");
     }
   } else if (auto iterableParent = llvm::dyn_cast<swift::IterableDeclContext>(parent)) {
     indexExtensions(iterableParent->getAllMembers());
   } else {
     // TODO use a generic logging handle for Swift entities here, once it's available
     CODEQL_ASSERT(false, "non-local context must be module or iterable decl context");
   }
-  if (auto found = preloadedExtensionIndexes.find(decl); found != preloadedExtensionIndexes.end()) {
-    return found->second;
-  } else {
-    // TODO use a generic logging handle for Swift entities here, once it's available
-    CODEQL_ASSERT(false, "extension not found within parent");
-  }
+  auto found = SwiftMangler::preloadedExtensionIndexes.find(decl);
+  // TODO use a generic logging handle for Swift entities here, once it's available
+  CODEQL_ASSERT(found != SwiftMangler::preloadedExtensionIndexes.end(),
+                "extension not found within parent");
+  return found->second;
 }
 
 void SwiftMangler::indexExtensions(llvm::ArrayRef<swift::Decl*> siblings) {
   auto index = 0u;
   for (auto sibling : siblings) {
     if (sibling->getKind() == swift::DeclKind::Extension) {
-      preloadedExtensionIndexes.emplace(sibling, index);
+      SwiftMangler::preloadedExtensionIndexes.emplace(sibling, index);
       index += 3u;
     }
   }
@@ -164,7 +161,7 @@ void SwiftMangler::indexClangExtensions(const clang::Module* clangModule,
       swiftSubmodule->getTopLevelDecls(children);
       for (const auto child : children) {
         if (child->getKind() == swift::DeclKind::Extension) {
-          preloadedExtensionIndexes.emplace(child, index);
+          SwiftMangler::preloadedExtensionIndexes.emplace(child, index);
           index += 7u;
         }
       }

swift/extractor/mangler/SwiftMangler.h

@@ -106,6 +106,8 @@ class SwiftMangler : private swift::TypeVisitor<SwiftMangler, SwiftMangledName>,
   SwiftMangledName visitPackExpansionType(const swift::PackExpansionType* type);
 
  private:
+  static std::unordered_map<const swift::Decl*, unsigned> preloadedExtensionIndexes;
+
   virtual SwiftMangledName fetch(const swift::Decl* decl) = 0;
   virtual SwiftMangledName fetch(const swift::TypeBase* type) = 0;
   SwiftMangledName fetch(swift::Type type) { return fetch(type.getPointer()); }