hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 11:15:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Swift: collect original output module paths

Browse Source
This commit is contained in:
Paolo Tranquilli
2023-01-18 09:37:58 +01:00
parent 84b285a4c6
commit 353536b826
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
swift/extractor/config/SwiftExtractorState.h
View File

@@ -21,6 +21,9 @@ struct SwiftExtractorState {
std::unordered_set<const swift::ModuleDecl*> encounteredModules;
std::vector<std::filesystem::path> sourceFiles;
// The path for the modules outputted by the underlying frontend run, ignoring path redirection
std::vector<std::filesystem::path> originalOutputModules;
};
} // namespace codeql

6
swift/extractor/main.cpp
View File

@@ -35,7 +35,8 @@ static void lockOutputSwiftModuleTraps(codeql::SwiftExtractorState& state,
}
}
static void processFrontendOptions(swift::FrontendOptions& options) {
static void processFrontendOptions(codeql::SwiftExtractorState& state,
swift::FrontendOptions& options) {
auto& inOuts = options.InputsAndOutputs;
std::vector<swift::InputFile> inputs;
inOuts.forEachInput([&](const swift::InputFile& input) {
@@ -53,6 +54,7 @@ static void processFrontendOptions(swift::FrontendOptions& options) {
input.getPrimarySpecificPaths().SupplementaryOutputs.ModuleOutputPath;
!module.empty()) {
psp.SupplementaryOutputs.ModuleOutputPath = codeql::redirect(module);
state.originalOutputModules.push_back(module);
}
auto inputCopy = input;
inputCopy.setPrimarySpecificPaths(std::move(psp));
@@ -77,7 +79,7 @@ class Observer : public swift::FrontendObserver {
void parsedArgs(swift::CompilerInvocation& invocation) override {
auto& options = invocation.getFrontendOptions();
lockOutputSwiftModuleTraps(state, options);
processFrontendOptions(options);
processFrontendOptions(state, options);
}
void configuredCompiler(swift::CompilerInstance& instance) override {