Swift: switch to references instead of pointers

Author: AlexDenisov

swift/extractor/SwiftDispatcher.h

@@ -24,7 +24,7 @@ class SwiftDispatcher {
                   TrapArena& arena,
                   TrapOutput& trap,
                   SwiftExtractionMode extractionMode,
-                  swift::ModuleDecl* currentModule,
+                  swift::ModuleDecl& currentModule,
                   llvm::StringRef currentFileName)
       : sourceManager{sourceManager},
         arena{arena},
@@ -143,15 +143,15 @@ class SwiftDispatcher {
   bool shouldEmitDeclBody(swift::Decl* decl) {
     switch (extractionMode) {
       case SwiftExtractionMode::Module: {
-        return currentModule == decl->getModuleContext();
+        return &currentModule == decl->getModuleContext();
       } break;
       case SwiftExtractionMode::PrimaryFile: {
         swift::SourceLoc location = decl->getStartLoc();
         if (!location.isValid()) {
           return false;
         }
         auto declFileName = sourceManager.getDisplayNameForLoc(location).str();
-        return currentModule == decl->getModuleContext() && declFileName == currentFileName;
+        return &currentModule == decl->getModuleContext() && declFileName == currentFileName;
       } break;
       default:
         return false;
@@ -239,7 +239,7 @@ class SwiftDispatcher {
   Store store;
   Store::Handle waitingForNewLabel{std::monostate{}};
   SwiftExtractionMode extractionMode;
-  swift::ModuleDecl* currentModule;
+  swift::ModuleDecl& currentModule;
   llvm::StringRef currentFileName;
 };
 

swift/extractor/SwiftExtractor.cpp

@@ -52,7 +52,7 @@ static void archiveFile(const SwiftExtractorConfiguration& config, swift::Source
 static void extractDeclarations(const SwiftExtractorConfiguration& config,
                                 swift::CompilerInstance& compiler,
                                 SwiftExtractionMode extractionMode,
-                                swift::ModuleDecl* module,
+                                swift::ModuleDecl& module,
                                 llvm::StringRef fileName,
                                 llvm::ArrayRef<swift::Decl*> topLevelDecls) {
   // The extractor can be called several times from different processes with
@@ -133,14 +133,14 @@ void codeql::extractSwiftFiles(const SwiftExtractorConfiguration& config,
       llvm::SmallVector<swift::Decl*> decls;
       module->getTopLevelDecls(decls);
       // TODO: pass ModuleDecl directly when we have module extraction in place?
-      extractDeclarations(config, compiler, SwiftExtractionMode::Module, module,
+      extractDeclarations(config, compiler, SwiftExtractionMode::Module, *module,
                           module->getModuleFilename(), decls);
     } else {
       // The extraction will only work if one (or more) `-primary-file` CLI option is provided,
       // which is what always happens in case of `swift build` and `xcodebuild`
       for (auto primaryFile : module->getPrimarySourceFiles()) {
         archiveFile(config, *primaryFile);
-        extractDeclarations(config, compiler, SwiftExtractionMode::PrimaryFile, module,
+        extractDeclarations(config, compiler, SwiftExtractionMode::PrimaryFile, *module,
                             primaryFile->getFilename(), primaryFile->getTopLevelDecls());
       }
     }