hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-01 11:45:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into redsun82/swift-precompiled-modules-are-not-extracted

Browse Source
This commit is contained in:
Paolo Tranquilli
2022-07-29 12:21:15 +02:00
committed by GitHub
parent 065fecc57e 69633948ce
commit 652230d021
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
swift/extractor/SwiftExtractor.cpp
View File

@@ -17,6 +17,7 @@
#include "swift/extractor/infra/TargetFile.h"
using namespace codeql;
using namespace std::string_literals;
static void archiveFile(const SwiftExtractorConfiguration& config, swift::SourceFile& file) {
if (std::error_code ec = llvm::sys::fs::create_directories(config.trapDir)) {
@@ -53,12 +54,16 @@ static std::string getFilename(swift::ModuleDecl& module, swift::SourceFile* pri
if (primaryFile) {
return primaryFile->getFilename().str();
}
// Several modules with different name might come from .pcm (clang module) files
// In this case we want to differentiate them
std::string filename = module.getModuleFilename().str();
filename += "-";
filename += module.getName().str();
return filename;
// PCM clang module
if (module.isNonSwiftModule()) {
// Several modules with different name might come from .pcm (clang module) files
// In this case we want to differentiate them
std::string filename = "/pcms/"s + llvm::sys::path::filename(module.getModuleFilename()).str();
filename += "-";
filename += module.getName().str();
return filename;
}
return module.getModuleFilename().str();
}
static llvm::SmallVector<swift::Decl*> getTopLevelDecls(swift::ModuleDecl& module,