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

Swift: route compiler diagnostics through our log

Browse Source 
(cherry picked from commit b8c55612e5)
This commit is contained in:
Paolo Tranquilli
2023-04-04 16:21:53 +01:00
committed by Alexandre Boulgakov
parent 7af1e96943
commit e3d6b3e537
3 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
swift/extractor/invocation/SwiftDiagnosticsConsumer.cpp
View File

@@ -1,5 +1,5 @@
#include "swift/extractor/invocation/SwiftDiagnosticsConsumer.h"
#include "swift/extractor/trap/generated/TrapEntries.h"
#include "swift/extractor/trap/generated/TrapClasses.h"
#include "swift/extractor/trap/TrapDomain.h"
#include "swift/extractor/infra/SwiftDiagnosticKind.h"
@@ -13,13 +13,17 @@ using namespace codeql;
void SwiftDiagnosticsConsumer::handleDiagnostic(swift::SourceManager& sourceManager,
const swift::DiagnosticInfo& diagInfo) {
auto message = getDiagMessage(sourceManager, diagInfo);
DiagnosticsTrap diag{};
diag.id = trap.createTypedLabel<DiagnosticsTag>();
if (diagInfo.IsChildNote) return;
Diagnostics diag{trap.createTypedLabel<DiagnosticsTag>()};
diag.kind = translateDiagnosticsKind(diagInfo.Kind);
diag.text = message;
diag.text = getDiagMessage(sourceManager, diagInfo);
trap.emit(diag);
locationExtractor.attachLocation(sourceManager, diagInfo, diag.id);
forwardToLog(sourceManager, diagInfo, diag.text);
for (const auto& child : diagInfo.ChildDiagnosticInfo) {
forwardToLog(sourceManager, *child);
}
}
std::string SwiftDiagnosticsConsumer::getDiagMessage(swift::SourceManager& sourceManager,
@@ -29,3 +33,29 @@ std::string SwiftDiagnosticsConsumer::getDiagMessage(swift::SourceManager& sourc
swift::DiagnosticEngine::formatDiagnosticText(out, diagInfo.FormatString, diagInfo.FormatArgs);
return text.str().str();
}
void SwiftDiagnosticsConsumer::forwardToLog(swift::SourceManager& sourceManager,
const swift::DiagnosticInfo& diagInfo,
const std::string& message) {
auto file = sourceManager.getDisplayNameForLoc(diagInfo.Loc);
auto [line, column] = sourceManager.getLineAndColumnInBuffer(diagInfo.Loc);
using Kind = swift::DiagnosticKind;
switch (diagInfo.Kind) {
case Kind::Error:
LOG_ERROR("{}:{}:{} {}", file, line, column, message);
break;
case Kind::Warning:
LOG_WARNING("{}:{}:{} {}", file, line, column, message);
break;
case Kind::Remark:
LOG_INFO("{}:{}:{} {}", file, line, column, message);
break;
case Kind::Note:
LOG_DEBUG("{}:{}:{} {}", file, line, column, message);
break;
default:
LOG_ERROR("unknown diagnostic kind {}, {}:{}:{} {}", diagInfo.Kind, file, line, column,
message);
break;
}
}