Swift: switch back to references

Author: AlexDenisov

swift/extractor/SwiftExtractor.cpp

@@ -18,7 +18,7 @@
 
 using namespace codeql;
 
-static void archiveFile(const SwiftExtractorConfiguration& config, swift::SourceFile* file) {
+static void archiveFile(const SwiftExtractorConfiguration& config, swift::SourceFile& file) {
   if (std::error_code ec = llvm::sys::fs::create_directories(config.trapDir)) {
     std::cerr << "Cannot create TRAP directory: " << ec.message() << "\n";
     return;
@@ -29,7 +29,7 @@ static void archiveFile(const SwiftExtractorConfiguration& config, swift::Source
     return;
   }
 
-  llvm::SmallString<PATH_MAX> srcFilePath(file->getFilename());
+  llvm::SmallString<PATH_MAX> srcFilePath(file.getFilename());
   llvm::sys::fs::make_absolute(srcFilePath);
 
   llvm::SmallString<PATH_MAX> dstFilePath(config.sourceArchiveDir);
@@ -51,12 +51,12 @@ static void archiveFile(const SwiftExtractorConfiguration& config, swift::Source
 
 static void extractFile(const SwiftExtractorConfiguration& config,
                         swift::CompilerInstance& compiler,
-                        swift::SourceFile* file) {
+                        swift::SourceFile& file) {
   // The extractor can be called several times from different processes with
   // the same input file(s)
   // We are using PID to avoid concurrent access
   // TODO: find a more robust approach to avoid collisions?
-  std::string tempTrapName = file->getFilename().str() + '.' + std::to_string(getpid()) + ".trap";
+  std::string tempTrapName = file.getFilename().str() + '.' + std::to_string(getpid()) + ".trap";
   llvm::SmallString<PATH_MAX> tempTrapPath(config.trapDir);
   llvm::sys::path::append(tempTrapPath, tempTrapName);
 
@@ -87,19 +87,19 @@ static void extractFile(const SwiftExtractorConfiguration& config,
   // In the case of emtpy files, the dispatcher is not called, but we still want to 'record' the
   // fact that the file was extracted
   // TODO: to be moved elsewhere
-  llvm::SmallString<PATH_MAX> srcFilePath(file->getFilename());
+  llvm::SmallString<PATH_MAX> srcFilePath(file.getFilename());
   llvm::sys::fs::make_absolute(srcFilePath);
   auto fileLabel = arena.allocateLabel<FileTag>();
   trap.assignKey(fileLabel, srcFilePath.str().str());
   trap.emit(FilesTrap{fileLabel, srcFilePath.str().str()});
 
   SwiftVisitor visitor(compiler.getSourceMgr(), arena, trap);
-  for (swift::Decl* decl : file->getTopLevelDecls()) {
+  for (swift::Decl* decl : file.getTopLevelDecls()) {
     visitor.extract(decl);
   }
 
   // TODO: Pick a better name to avoid collisions
-  std::string trapName = file->getFilename().str() + ".trap";
+  std::string trapName = file.getFilename().str() + ".trap";
   llvm::SmallString<PATH_MAX> trapPath(config.trapDir);
   llvm::sys::path::append(trapPath, trapName);
 
@@ -112,8 +112,10 @@ static void extractFile(const SwiftExtractorConfiguration& config,
 
 void codeql::extractSwiftFiles(const SwiftExtractorConfiguration& config,
                                swift::CompilerInstance& compiler) {
+  // The extraction will only work if one (or more) `-primary-file` CLI option is provided, which
+  // is what always happen in case of `swift build` and `xcodebuild`
   for (auto s : compiler.getPrimarySourceFiles()) {
-    archiveFile(config, s);
-    extractFile(config, compiler, s);
+    archiveFile(config, *s);
+    extractFile(config, compiler, *s);
   }
 }