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

Merge branch 'main' into redsun82/swift-json

Browse Source
This commit is contained in:
Paolo Tranquilli
2023-05-04 10:34:11 +02:00
parent bd303357f7 3d0935affa
commit 9544b96ff1
248 changed files with 3166 additions and 1939 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
swift/extractor/invocation/SwiftInvocationExtractor.cpp
View File

@@ -4,6 +4,7 @@
#include "swift/extractor/trap/generated/TrapTags.h"
#include "swift/extractor/infra/file/TargetFile.h"
#include "swift/extractor/infra/file/Path.h"
#include "swift/log/SwiftAssert.h"
#include "swift/extractor/mangler/SwiftMangler.h"
namespace fs = std::filesystem;
@@ -11,6 +12,12 @@ using namespace std::string_literals;
namespace codeql {
namespace {
Logger& logger() {
static Logger ret{"invocation"};
return ret;
}
std::string getModuleId(const std::string_view& name, const std::string_view& hash) {
auto ret = "module:"s;
ret += name;
@@ -109,10 +116,8 @@ void replaceMergedModulesImplementation(const SwiftExtractorState& state,
fs::copy(getTrapPath(state, mergeTarget, TrapType::linkage),
getTrapPath(state, mergedPartTarget, TrapType::linkage),
fs::copy_options::overwrite_existing, ec);
if (ec) {
std::cerr << "unable to replace trap implementation id for merged module '" << name << "' ("
<< ec.message() << ")";
}
CODEQL_ASSERT(!ec, "Unable to replace trap implementation id for merged module '{}' ({})", name,
ec);
}
void emitModuleObjectDependencies(const SwiftExtractorState& state,