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

Swift: Rename diagnostics consumer

Browse Source
This commit is contained in:
Alex Denisov
2022-11-08 14:56:50 +01:00
parent 2b8b6d3dc3
commit 609c7cf84d
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
swift/extractor/invocation/CodeQLDiagnosticsConsumer.cpp → swift/extractor/invocation/SwiftDiagnosticsConsumer.cpp
View File

@@ -1,4 +1,4 @@
#include "swift/extractor/invocation/CodeQLDiagnosticsConsumer.h" #include "swift/extractor/invocation/SwiftDiagnosticsConsumer.h"
#include "swift/extractor/trap/generated/TrapEntries.h" #include "swift/extractor/trap/generated/TrapEntries.h"
#include <swift/AST/DiagnosticEngine.h> #include <swift/AST/DiagnosticEngine.h>
@@ -25,8 +25,8 @@ static int diagnosticsKind(const swift::DiagnosticInfo& diagInfo) {
return 0; return 0;
} }
void CodeQLDiagnosticsConsumer::handleDiagnostic(swift::SourceManager& sourceManager, void SwiftDiagnosticsConsumer::handleDiagnostic(swift::SourceManager& sourceManager,
const swift::DiagnosticInfo& diagInfo) { const swift::DiagnosticInfo& diagInfo) {
auto message = getDiagMessage(sourceManager, diagInfo); auto message = getDiagMessage(sourceManager, diagInfo);
DiagnosticsTrap diag{}; DiagnosticsTrap diag{};
diag.id = trap.createLabel<DiagnosticsTag>(); diag.id = trap.createLabel<DiagnosticsTag>();
@@ -36,8 +36,8 @@ void CodeQLDiagnosticsConsumer::handleDiagnostic(swift::SourceManager& sourceMan
locationExtractor.attachLocation(sourceManager, diagInfo.Loc, diagInfo.Loc, diag.id); locationExtractor.attachLocation(sourceManager, diagInfo.Loc, diagInfo.Loc, diag.id);
} }
std::string CodeQLDiagnosticsConsumer::getDiagMessage(swift::SourceManager& sourceManager, std::string SwiftDiagnosticsConsumer::getDiagMessage(swift::SourceManager& sourceManager,
const swift::DiagnosticInfo& diagInfo) { const swift::DiagnosticInfo& diagInfo) {
// Translate ranges. // Translate ranges.
llvm::SmallVector<llvm::SMRange, 2> ranges; llvm::SmallVector<llvm::SMRange, 2> ranges;
for (auto R : diagInfo.Ranges) for (auto R : diagInfo.Ranges)

4
swift/extractor/invocation/CodeQLDiagnosticsConsumer.h → swift/extractor/invocation/SwiftDiagnosticsConsumer.h
View File

@@ -7,9 +7,9 @@ namespace codeql {
class TrapDomain; class TrapDomain;
class CodeQLDiagnosticsConsumer : public swift::DiagnosticConsumer { class SwiftDiagnosticsConsumer : public swift::DiagnosticConsumer {
public: public:
explicit CodeQLDiagnosticsConsumer(TrapDomain& targetFile) explicit SwiftDiagnosticsConsumer(TrapDomain& targetFile)
: trap(targetFile), locationExtractor(targetFile) {} : trap(targetFile), locationExtractor(targetFile) {}
void handleDiagnostic(swift::SourceManager& sourceManager, void handleDiagnostic(swift::SourceManager& sourceManager,
const swift::DiagnosticInfo& diagInfo) override; const swift::DiagnosticInfo& diagInfo) override;

8
swift/extractor/main.cpp
View File

@@ -14,7 +14,7 @@
#include "swift/extractor/TargetTrapFile.h" #include "swift/extractor/TargetTrapFile.h"
#include "swift/extractor/remapping/SwiftOutputRewrite.h" #include "swift/extractor/remapping/SwiftOutputRewrite.h"
#include "swift/extractor/remapping/SwiftOpenInterception.h" #include "swift/extractor/remapping/SwiftOpenInterception.h"
#include "swift/extractor/invocation/CodeQLDiagnosticsConsumer.h" #include "swift/extractor/invocation/SwiftDiagnosticsConsumer.h"
#include "swift/extractor/trap/TrapDomain.h" #include "swift/extractor/trap/TrapDomain.h"
using namespace std::string_literals; using namespace std::string_literals;
@@ -25,7 +25,7 @@ using namespace std::string_literals;
class Observer : public swift::FrontendObserver { class Observer : public swift::FrontendObserver {
public: public:
explicit Observer(const codeql::SwiftExtractorConfiguration& config, explicit Observer(const codeql::SwiftExtractorConfiguration& config,
codeql::CodeQLDiagnosticsConsumer& diagConsumer) codeql::SwiftDiagnosticsConsumer& diagConsumer)
: config{config}, diagConsumer{diagConsumer} {} : config{config}, diagConsumer{diagConsumer} {}
void configuredCompiler(swift::CompilerInstance& instance) override { void configuredCompiler(swift::CompilerInstance& instance) override {
@@ -38,7 +38,7 @@ class Observer : public swift::FrontendObserver {
private: private:
const codeql::SwiftExtractorConfiguration& config; const codeql::SwiftExtractorConfiguration& config;
codeql::CodeQLDiagnosticsConsumer& diagConsumer; codeql::SwiftDiagnosticsConsumer& diagConsumer;
}; };
static std::string getenv_or(const char* envvar, const std::string& def) { static std::string getenv_or(const char* envvar, const std::string& def) {
@@ -158,7 +158,7 @@ int main(int argc, char** argv) {
auto invocationTrapFile = invocationTargetFile(configuration); auto invocationTrapFile = invocationTargetFile(configuration);
codeql::TrapDomain invocationDomain(invocationTrapFile); codeql::TrapDomain invocationDomain(invocationTrapFile);
codeql::CodeQLDiagnosticsConsumer diagConsumer(invocationDomain); codeql::SwiftDiagnosticsConsumer diagConsumer(invocationDomain);
Observer observer(configuration, diagConsumer); Observer observer(configuration, diagConsumer);
int frontend_rc = swift::performFrontend(args, "swift-extractor", (void*)main, &observer); int frontend_rc = swift::performFrontend(args, "swift-extractor", (void*)main, &observer);