[llvm-commits] [llvm] r66975 - in /llvm/trunk/utils/TableGen: ClangDiagnosticsEmitter.cpp ClangDiagnosticsEmitter.h TableGen.cpp
Ted Kremenek
kremenek at apple.com
Fri Mar 13 15:53:41 PDT 2009
Author: kremenek
Date: Fri Mar 13 17:53:41 2009
New Revision: 66975
URL: http://llvm.org/viewvc/llvm-project?rev=66975&view=rev
Log:
Add (hidden) TableGen command option '-clang-component' which specifies the
component's warnings to process for '-gen-clang-diags-defs'.
Also, when the component is specified, generate a '#if' prologue at the top of
the generated .def file (to match the current files).
Modified:
llvm/trunk/utils/TableGen/ClangDiagnosticsEmitter.cpp
llvm/trunk/utils/TableGen/ClangDiagnosticsEmitter.h
llvm/trunk/utils/TableGen/TableGen.cpp
Modified: llvm/trunk/utils/TableGen/ClangDiagnosticsEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/ClangDiagnosticsEmitter.cpp?rev=66975&r1=66974&r2=66975&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/ClangDiagnosticsEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/ClangDiagnosticsEmitter.cpp Fri Mar 13 17:53:41 2009
@@ -22,8 +22,8 @@
typedef std::vector<Record*> SuperClassVector;
typedef std::vector<RecordVal> RecordValVector;
-static const RecordVal* findRecordVal(const RecordValVector& Vals,
- const std::string &key) {
+static const RecordVal* findRecordVal(const Record& R, const std::string &key) {
+ const RecordValVector &Vals = R.getValues();
for (RecordValVector::const_iterator I=Vals.begin(), E=Vals.end(); I!=E; ++I)
if ((*I).getName() == key)
return &*I;
@@ -49,6 +49,11 @@
}
}
+static void EmitAllCaps(std::ostream& OS, const std::string &s) {
+ for (std::string::const_iterator I=s.begin(), E=s.end(); I!=E; ++I)
+ OS << char(toupper(*I));
+}
+
static void ProcessDiag(std::ostream& OS, const Record* DiagClass,
const Record& R) {
@@ -57,12 +62,9 @@
return;
OS << "DIAG(" << R.getName() << ", ";
+ EmitAllCaps(OS, DiagKind->getName());
- const std::string &s = DiagKind->getName();
- for (std::string::const_iterator I=s.begin(), E=s.end(); I!=E; ++I)
- OS << char(toupper(*I));
-
- const RecordVal* Text = findRecordVal(R.getValues(), "Text");
+ const RecordVal* Text = findRecordVal(R, "Text");
assert(Text && "No 'Text' entry in Diagnostic.");
const StringInit* TextVal = dynamic_cast<const StringInit*>(Text->getValue());
assert(TextVal && "Value 'Text' must be a string.");
@@ -77,8 +79,30 @@
const Record* DiagClass = Records.getClass("Diagnostic");
assert(DiagClass && "No Diagnostic class defined.");
+ // Write the #if guard
+ if (!Component.empty()) {
+ OS << "#ifdef ";
+ EmitAllCaps(OS, Component);
+ OS << "START\n__";
+ EmitAllCaps(OS, Component);
+ OS << "START = DIAG_START_";
+ EmitAllCaps(OS, Component);
+ OS << ",\n#undef ";
+ EmitAllCaps(OS, Component);
+ OS << "START\n#endif\n";
+ }
+
for (RecordVector::const_iterator I=Diags.begin(), E=Diags.end(); I!=E; ++I) {
- // FIXME: Compare the component.
+ if (!Component.empty()) {
+ const RecordVal* V = findRecordVal(**I, "Component");
+ if (!V)
+ continue;
+
+ const StringInit* SV = dynamic_cast<const StringInit*>(V->getValue());
+ if (SV->getValue() != Component)
+ continue;
+ }
+
ProcessDiag(OS, DiagClass, **I);
}
-}
\ No newline at end of file
+}
Modified: llvm/trunk/utils/TableGen/ClangDiagnosticsEmitter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/ClangDiagnosticsEmitter.h?rev=66975&r1=66974&r2=66975&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/ClangDiagnosticsEmitter.h (original)
+++ llvm/trunk/utils/TableGen/ClangDiagnosticsEmitter.h Fri Mar 13 17:53:41 2009
@@ -23,8 +23,10 @@
///
class ClangDiagsDefsEmitter : public TableGenBackend {
RecordKeeper &Records;
+ const std::string& Component;
public:
- explicit ClangDiagsDefsEmitter(RecordKeeper &R) : Records(R) {}
+ explicit ClangDiagsDefsEmitter(RecordKeeper &R, const std::string& component)
+ : Records(R), Component(component) {}
// run - Output the .def file contents
void run(std::ostream &OS);
Modified: llvm/trunk/utils/TableGen/TableGen.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/TableGen.cpp?rev=66975&r1=66974&r2=66975&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/TableGen.cpp (original)
+++ llvm/trunk/utils/TableGen/TableGen.cpp Fri Mar 13 17:53:41 2009
@@ -110,6 +110,11 @@
cl::list<std::string>
IncludeDirs("I", cl::desc("Directory of include files"),
cl::value_desc("directory"), cl::Prefix);
+
+ cl::opt<std::string>
+ ClangComponent("clang-component",
+ cl::desc("Only use warnings from specified component"),
+ cl::value_desc("component"), cl::Hidden);
}
@@ -202,7 +207,7 @@
AsmWriterEmitter(Records).run(*Out);
break;
case GenClangDiagsDefs:
- ClangDiagsDefsEmitter(Records).run(*Out);
+ ClangDiagsDefsEmitter(Records, ClangComponent).run(*Out);
break;
case GenDAGISel:
DAGISelEmitter(Records).run(*Out);
More information about the llvm-commits
mailing list