Author: arphaman Date: Wed Jul 12 09:41:49 2017 New Revision: 307813 URL: http://llvm.org/viewvc/llvm-project?rev=307813&view=rev Log: [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 Added: cfe/trunk/test/Misc/find-diagnostic-id.c cfe/trunk/tools/diagtool/FindDiagnosticID.cpp Modified: cfe/trunk/tools/diagtool/CMakeLists.txt Added: cfe/trunk/test/Misc/find-diagnostic-id.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Misc/find-diagnostic-id.c?rev=307813&view=auto ============================================================================== --- cfe/trunk/test/Misc/find-diagnostic-id.c (added) +++ cfe/trunk/test/Misc/find-diagnostic-id.c Wed Jul 12 09:41:49 2017 @@ -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' Modified: cfe/trunk/tools/diagtool/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/diagtool/CMakeLists.txt?rev=307813&r1=307812&r2=307813&view=diff ============================================================================== --- cfe/trunk/tools/diagtool/CMakeLists.txt (original) +++ cfe/trunk/tools/diagtool/CMakeLists.txt Wed Jul 12 09:41:49 2017 @@ -6,6 +6,7 @@ add_clang_executable(diagtool diagtool_main.cpp DiagTool.cpp DiagnosticNames.cpp + FindDiagnosticID.cpp ListWarnings.cpp ShowEnabledWarnings.cpp TreeView.cpp Added: cfe/trunk/tools/diagtool/FindDiagnosticID.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/diagtool/FindDiagnosticID.cpp?rev=307813&view=auto ============================================================================== --- cfe/trunk/tools/diagtool/FindDiagnosticID.cpp (added) +++ cfe/trunk/tools/diagtool/FindDiagnosticID.cpp Wed Jul 12 09:41:49 2017 @@ -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; +} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
