From ddf44dafd4c3aaed246fe1856db9e04ba3549245 Mon Sep 17 00:00:00 2001
From: Alex Lorenz <arphaman@gmail.com>
Date: Wed, 12 Jul 2017 16:41:49 +0000
Subject: [PATCH] [diagtool] Add a 'find-diagnostic-id' subcommand that
converts a name of the diagnostic to its enum value
This will be used by a script that invokes clang in a debugger and forces it
to stop when it reports a particular diagnostic.
Differential Revision: https://reviews.llvm.org/D35306
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@307813 91177308-0d34-0410-b5e6-96231b3b80d8
---
test/Misc/find-diagnostic-id.c | 5 +++
tools/diagtool/CMakeLists.txt | 1 +
tools/diagtool/FindDiagnosticID.cpp | 58 +++++++++++++++++++++++++++++
3 files changed, 64 insertions(+)
create mode 100644 test/Misc/find-diagnostic-id.c
create mode 100644 tools/diagtool/FindDiagnosticID.cpp
diff --git a/test/Misc/find-diagnostic-id.c b/test/Misc/find-diagnostic-id.c
new file mode 100644
index 00000000000..bef66178f96
--- /dev/null
+++ b/test/Misc/find-diagnostic-id.c
@@ -0,0 +1,5 @@
+// RUN: diagtool find-diagnostic-id warn_unused_variable | FileCheck %s
+// RUN: not diagtool find-diagnostic-id warn_unused_vars 2>&1 | FileCheck --check-prefix=ERROR %s
+
+// CHECK: {{^[0-9]+$}}
+// ERROR: error: invalid diagnostic 'warn_unused_vars'
diff --git a/tools/diagtool/CMakeLists.txt b/tools/diagtool/CMakeLists.txt
index e88c2ab6e8c..3f7d80385a8 100644
--- a/tools/diagtool/CMakeLists.txt
+++ b/tools/diagtool/CMakeLists.txt
@@ -6,6 +6,7 @@ add_clang_executable(diagtool
diagtool_main.cpp
DiagTool.cpp
DiagnosticNames.cpp
+ FindDiagnosticID.cpp
ListWarnings.cpp
ShowEnabledWarnings.cpp
TreeView.cpp
diff --git a/tools/diagtool/FindDiagnosticID.cpp b/tools/diagtool/FindDiagnosticID.cpp
new file mode 100644
index 00000000000..167b9925eed
--- /dev/null
+++ b/tools/diagtool/FindDiagnosticID.cpp
@@ -0,0 +1,58 @@
+//===- FindDiagnosticID.cpp - diagtool tool for finding diagnostic id -----===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "DiagTool.h"
+#include "DiagnosticNames.h"
+#include "clang/Basic/AllDiagnostics.h"
+#include "llvm/Support/CommandLine.h"
+
+DEF_DIAGTOOL("find-diagnostic-id", "Print the id of the given diagnostic",
+ FindDiagnosticID)
+
+using namespace clang;
+using namespace diagtool;
+
+static Optional<DiagnosticRecord>
+findDiagnostic(ArrayRef<DiagnosticRecord> Diagnostics, StringRef Name) {
+ for (const auto &Diag : Diagnostics) {
+ StringRef DiagName = Diag.getName();
+ if (DiagName == Name)
+ return Diag;
+ }
+ return None;
+}
+
+int FindDiagnosticID::run(unsigned int argc, char **argv,
+ llvm::raw_ostream &OS) {
+ static llvm::cl::OptionCategory FindDiagnosticIDOptions(
+ "diagtool find-diagnostic-id options");
+
+ static llvm::cl::opt<std::string> DiagnosticName(
+ llvm::cl::Positional, llvm::cl::desc("<diagnostic-name>"),
+ llvm::cl::Required, llvm::cl::cat(FindDiagnosticIDOptions));
+
+ std::vector<const char *> Args;
+ Args.push_back("find-diagnostic-id");
+ for (const char *A : llvm::makeArrayRef(argv, argc))
+ Args.push_back(A);
+
+ llvm::cl::HideUnrelatedOptions(FindDiagnosticIDOptions);
+ llvm::cl::ParseCommandLineOptions((int)Args.size(), Args.data(),
+ "Diagnostic ID mapping utility");
+
+ ArrayRef<DiagnosticRecord> AllDiagnostics = getBuiltinDiagnosticsByName();
+ Optional<DiagnosticRecord> Diag =
+ findDiagnostic(AllDiagnostics, DiagnosticName);
+ if (!Diag) {
+ llvm::errs() << "error: invalid diagnostic '" << DiagnosticName << "'\n";
+ return 1;
+ }
+ OS << Diag->DiagID << "\n";
+ return 0;
+}
--
GitLab