maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[diagtool] Add ability to pass in the id and return the name for a 

particular diagnostic.

Differential Revision: https://reviews.llvm.org/D36252

llvm-svn: 309955
This commit is contained in:
Don Hinton 2017-08-03 16:13:13 +00:00
parent 5fb17128f7
commit 6c2ded879d
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/test/Misc/find-diagnostic-id.c
View File

@ -1,5 +1,7 @@
// RUN: diagtool find-diagnostic-id warn_unused_variable | FileCheck %s
// RUN: diagtool find-diagnostic-id warn_unused_variable > %t; FileCheck %s < %t
// RUN: cat %t | xargs diagtool find-diagnostic-id | FileCheck %s --check-prefix=INVERSE
// RUN: not diagtool find-diagnostic-id warn_unused_vars 2>&1 | FileCheck --check-prefix=ERROR %s
// CHECK: {{^[0-9]+$}}
// INVERSE: warn_unused_variable
// ERROR: error: invalid diagnostic 'warn_unused_vars'

18
clang/tools/diagtool/FindDiagnosticID.cpp
View File

@ -18,6 +18,15 @@ DEF_DIAGTOOL("find-diagnostic-id", "Print the id of the given diagnostic",
using namespace clang;
using namespace diagtool;
static StringRef getNameFromID(StringRef Name) {
int DiagID;
if(!Name.getAsInteger(0, DiagID)) {
const DiagnosticRecord &Diag = getDiagnosticForID(DiagID);
return Diag.getName();
}
return StringRef();
}
static Optional<DiagnosticRecord>
findDiagnostic(ArrayRef<DiagnosticRecord> Diagnostics, StringRef Name) {
for (const auto &Diag : Diagnostics) {
@ -38,7 +47,7 @@ int FindDiagnosticID::run(unsigned int argc, char **argv,
llvm::cl::Required, llvm::cl::cat(FindDiagnosticIDOptions));
std::vector<const char *> Args;
Args.push_back("find-diagnostic-id");
Args.push_back("diagtool find-diagnostic-id");
for (const char *A : llvm::makeArrayRef(argv, argc))
Args.push_back(A);
@ -50,6 +59,13 @@ int FindDiagnosticID::run(unsigned int argc, char **argv,
Optional<DiagnosticRecord> Diag =
findDiagnostic(AllDiagnostics, DiagnosticName);
if (!Diag) {
// Name to id failed, so try id to name.
auto Name = getNameFromID(DiagnosticName);
if (!Name.empty()) {
OS << Name << '\n';
return 0;
}
llvm::errs() << "error: invalid diagnostic '" << DiagnosticName << "'\n";
return 1;
}