From 8c11bcf73a034ccc96512ef89ea31639519b2130 Mon Sep 17 00:00:00 2001 From: Richard Barton Date: Fri, 16 Oct 2015 20:15:29 +0000 Subject: [PATCH] Further increase helfulness of assert message If you increase the number of diags of a particular type by one more than the number available you get the nice assert message. If you do it by two more than available you get the old non-helpful message. Combining the two makes sense I think. llvm-svn: 250546 --- clang/lib/Basic/DiagnosticIDs.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/clang/lib/Basic/DiagnosticIDs.cpp b/clang/lib/Basic/DiagnosticIDs.cpp index 643503b00b91..b855ac2e32f5 100644 --- a/clang/lib/Basic/DiagnosticIDs.cpp +++ b/clang/lib/Basic/DiagnosticIDs.cpp @@ -101,12 +101,9 @@ static const StaticDiagInfoRec *GetDiagInfo(unsigned DiagID) { static bool IsFirst = true; // So the check is only performed on first call. if (IsFirst) { for (unsigned i = 1; i != StaticDiagInfoSize; ++i) { - assert(StaticDiagInfo[i-1].DiagID != StaticDiagInfo[i].DiagID && + assert(StaticDiagInfo[i-1] < StaticDiagInfo[i] && "Diag ID conflict, the enums at the start of clang::diag (in " "DiagnosticIDs.h) probably need to be increased"); - - assert(StaticDiagInfo[i-1] < StaticDiagInfo[i] && - "Improperly sorted diag info"); } IsFirst = false; }