don't infer diag class from parenting relations, make it an explicit field
in the record.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@69176 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/utils/TableGen/ClangDiagnosticsEmitter.cpp b/utils/TableGen/ClangDiagnosticsEmitter.cpp
index 430b4f7..147e2fd 100644
--- a/utils/TableGen/ClangDiagnosticsEmitter.cpp
+++ b/utils/TableGen/ClangDiagnosticsEmitter.cpp
@@ -39,16 +39,6 @@
return 0;
}
-static const Record* getDiagKind(const Record* DiagClass, const Record &R) {
- const SuperClassVector &SC = R.getSuperClasses();
- for (SuperClassVector::const_iterator I=SC.begin(), E=SC.end(); I!=E; ++I)
- if ((*I)->isSubClassOf(DiagClass) &&
- (*I)->getName() != "DiagnosticControlled")
- return *I;
-
- return 0;
-}
-
static void EmitEscaped(std::ostream& OS, const std::string &s) {
for (std::string::const_iterator I=s.begin(), E=s.end(); I!=E; ++I)
switch (*I) {
@@ -69,12 +59,8 @@
static void ProcessDiag(std::ostream &OS, const Record *DiagClass,
const Record &R) {
- const Record* DiagKind = getDiagKind(DiagClass, R);
- if (!DiagKind)
- return;
-
OS << "DIAG(" << R.getName() << ", ";
- EmitAllCaps(OS, DiagKind->getName());
+ OS << R.getValueAsDef("Class")->getName();
OS << ", diag::" << R.getValueAsDef("DefaultMapping")->getName();
OS << ", \"";
EmitEscaped(OS, R.getValueAsString("Text"));