diaggroup categories should take precedence over diag-specific groups.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@104567 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/utils/TableGen/ClangDiagnosticsEmitter.cpp b/utils/TableGen/ClangDiagnosticsEmitter.cpp
index b2ddf93..75b6252 100644
--- a/utils/TableGen/ClangDiagnosticsEmitter.cpp
+++ b/utils/TableGen/ClangDiagnosticsEmitter.cpp
@@ -70,15 +70,16 @@
/// lives in.
static std::string getDiagnosticCategory(const Record *R,
DiagGroupParentMap &DiagGroupParents) {
+ // If the diagnostic is in a group, and that group has a category, use it.
+ if (DefInit *Group = dynamic_cast<DefInit*>(R->getValueInit("Group"))) {
+ // Check the diagnostic's diag group for a category.
+ std::string CatName = getCategoryFromDiagGroup(Group->getDef(),
+ DiagGroupParents);
+ if (!CatName.empty()) return CatName;
+ }
+
// If the diagnostic itself has a category, get it.
- std::string CatName = R->getValueAsString("CategoryName");
- if (!CatName.empty()) return CatName;
-
- DefInit *Group = dynamic_cast<DefInit*>(R->getValueInit("Group"));
- if (Group == 0) return "";
-
- // Check the diagnostic's diag group for a category.
- return getCategoryFromDiagGroup(Group->getDef(), DiagGroupParents);
+ return R->getValueAsString("CategoryName");
}
namespace {