Test

Author: jketema

swift/extractor/mangler/SwiftMangler.cpp

@@ -19,6 +19,8 @@ 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) {
@@ -111,26 +113,31 @@ 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.extract(decl)) {
-    return found.mapped();
+  if (auto found = preloadedExtensionIndexes.find(decl); found != 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");
   }
-  auto found = preloadedExtensionIndexes.extract(decl);
-  // TODO use a generic logging handle for Swift entities here, once it's available
-  CODEQL_ASSERT(found, "extension not found within parent");
-  return found.mapped();
+  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");
+  }
 }
 
 void SwiftMangler::indexExtensions(llvm::ArrayRef<swift::Decl*> siblings) {

swift/extractor/mangler/SwiftMangler.h

@@ -106,8 +106,6 @@ class SwiftMangler : private swift::TypeVisitor<SwiftMangler, SwiftMangledName>,
   SwiftMangledName visitPackExpansionType(const swift::PackExpansionType* type);
 
  private:
-  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()); }