diff options
| author | David Majnemer <david.majnemer@gmail.com> | 2013-07-20 07:15:15 +0000 |
|---|---|---|
| committer | David Majnemer <david.majnemer@gmail.com> | 2013-07-20 07:15:15 +0000 |
| commit | 38af2a2158699791c76226dabc9bed1f4a73352e (patch) | |
| tree | dece226767043c081823b3083f684490bab6ad4d /clang/lib | |
| parent | a9b57f6bea970d29f027ed01ab8c86ad7992c757 (diff) | |
| download | bcm5719-llvm-38af2a2158699791c76226dabc9bed1f4a73352e.tar.gz bcm5719-llvm-38af2a2158699791c76226dabc9bed1f4a73352e.zip | |
DiagnosticIDs: Forbid Diag ID from being valid
Diag ID is used throughout clang as a sentinel id meaning "this is an
invalid diagnostic id." Confusingly, Diag ID maps to a valid, usable,
diagnostic id. Instead, start diagnostic ids at ID one.
Incidently, remove an unused element from StaticDiagInfo.
llvm-svn: 186760
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Basic/DiagnosticIDs.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/clang/lib/Basic/DiagnosticIDs.cpp b/clang/lib/Basic/DiagnosticIDs.cpp index a703876da12..e96d5097e62 100644 --- a/clang/lib/Basic/DiagnosticIDs.cpp +++ b/clang/lib/Basic/DiagnosticIDs.cpp @@ -15,8 +15,8 @@ #include "clang/Basic/AllDiagnostics.h" #include "clang/Basic/DiagnosticCategories.h" #include "clang/Basic/SourceManager.h" -#include "llvm/ADT/STLExtras.h" #include "llvm/ADT/SmallVector.h" +#include "llvm/ADT/STLExtras.h" #include "llvm/Support/ErrorHandling.h" #include <map> using namespace clang; @@ -83,11 +83,9 @@ static const StaticDiagInfoRec StaticDiagInfo[] = { #include "clang/Basic/DiagnosticSemaKinds.inc" #include "clang/Basic/DiagnosticAnalysisKinds.inc" #undef DIAG - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} }; -static const unsigned StaticDiagInfoSize = - llvm::array_lengthof(StaticDiagInfo)-1; +static const unsigned StaticDiagInfoSize = llvm::array_lengthof(StaticDiagInfo); /// GetDiagInfo - Return the StaticDiagInfoRec entry for the specified DiagID, /// or null if the ID is invalid. @@ -106,7 +104,7 @@ static const StaticDiagInfoRec *GetDiagInfo(unsigned DiagID) { // Out of bounds diag. Can't be in the table. using namespace diag; - if (DiagID >= DIAG_UPPER_LIMIT) + if (DiagID >= DIAG_UPPER_LIMIT || DiagID <= DIAG_START_COMMON) return 0; // Compute the index of the requested diagnostic in the static table. @@ -118,8 +116,7 @@ static const StaticDiagInfoRec *GetDiagInfo(unsigned DiagID) { // This is cheaper than a binary search on the table as it doesn't touch // memory at all. unsigned Offset = 0; - unsigned ID = DiagID; -#define DIAG_START_COMMON 0 // Sentinel value. + unsigned ID = DiagID - DIAG_START_COMMON - 1; #define CATEGORY(NAME, PREV) \ if (DiagID > DIAG_START_##NAME) { \ Offset += NUM_BUILTIN_##PREV##_DIAGNOSTICS - DIAG_START_##PREV - 1; \ @@ -135,7 +132,6 @@ CATEGORY(COMMENT, AST) CATEGORY(SEMA, COMMENT) CATEGORY(ANALYSIS, SEMA) #undef CATEGORY -#undef DIAG_START_COMMON // Avoid out of bounds reads. if (ID + Offset >= StaticDiagInfoSize) |
