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: move TargetFile as managed inside TrapDomain

Browse Source
This commit is contained in:
Paolo Tranquilli
2022-12-19 10:26:20 +01:00
parent 20eaa34485
commit c31c515205
7 changed files with 45 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
swift/extractor/SwiftExtractor.cpp
View File

@@ -10,7 +10,7 @@
#include "swift/extractor/trap/TrapDomain.h"
#include "swift/extractor/translators/SwiftVisitor.h"
#include "swift/extractor/TargetTrapFile.h"
#include "swift/extractor/TargetTrapDomain.h"
#include "swift/extractor/SwiftBuiltinSymbols.h"
#include "swift/extractor/infra/file/Path.h"
@@ -118,12 +118,11 @@ static std::unordered_set<swift::ModuleDecl*> extractDeclarations(
// The extractor can be called several times from different processes with
// the same input file(s). Using `TargetFile` the first process will win, and the following
// will just skip the work
auto trapTarget = createTargetTrapFile(config, filename);
if (!trapTarget) {
auto trap = createTargetTrapDomain(config, filename);
if (!trap) {
// another process arrived first, nothing to do for us
return {};
}
TrapDomain trap{*trapTarget};
std::vector<swift::Token> comments;
if (primaryFile && primaryFile->getBufferID().hasValue()) {
@@ -137,7 +136,7 @@ static std::unordered_set<swift::ModuleDecl*> extractDeclarations(
}
}
SwiftVisitor visitor(compiler.getSourceMgr(), trap, module, primaryFile);
SwiftVisitor visitor(compiler.getSourceMgr(), *trap, module, primaryFile);
auto topLevelDecls = getTopLevelDecls(module, primaryFile);
for (auto decl : topLevelDecls) {
visitor.extract(decl);