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

Swift: make trap domain logger names more informative

Browse Source
This commit is contained in:
Paolo Tranquilli
2023-04-06 12:53:47 +02:00
parent a5162b0b7d
commit acaa6a5ea7
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
swift/extractor/trap/TrapDomain.h
View File

@@ -12,10 +12,12 @@ namespace codeql {
// Abstracts a given trap output file, with its own universe of trap labels
class TrapDomain {
TargetFile out;
Logger logger{out.target().filename()};
Logger logger{getLoggerName()};
public:
explicit TrapDomain(TargetFile&& out) : out{std::move(out)} {}
explicit TrapDomain(TargetFile&& out) : out{std::move(out)} {
LOG_DEBUG("writing trap file with target {}", this->out.target());
}
template <typename Entry>
void emit(const Entry& e) {
@@ -84,6 +86,17 @@ class TrapDomain {
(oss << ... << keyParts);
assignKey(label, oss.str());
}
std::string getLoggerName() {
// packaged swift modules are typically structured as
// `Module.swiftmodule/<arch_triple>.swiftmodule`, so the parent is more informative
// We use `Module.swiftmodule/.trap` then
if (auto parent = out.target().parent_path(); parent.extension() == ".swiftmodule") {
return parent.filename() / ".trap";
} else {
return out.target().filename();
}
}
};
} // namespace codeql