From 0e28a257727f092fbb2d544fd9aaf3b20a323456 Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Wed, 28 Aug 2013 06:01:10 +0000 Subject: [PATCH] Reorder and shrink size of NameLen field in diagnostic group table. Shaves ~4K from clang binary. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@189445 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Basic/DiagnosticIDs.cpp | 9 ++++----- tools/diagtool/DiagnosticNames.h | 5 +---- tools/diagtool/TreeView.cpp | 7 ++++++- utils/TableGen/ClangDiagnosticsEmitter.cpp | 4 +++- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/lib/Basic/DiagnosticIDs.cpp b/lib/Basic/DiagnosticIDs.cpp index 9741f38684..cccf418f65 100644 --- a/lib/Basic/DiagnosticIDs.cpp +++ b/lib/Basic/DiagnosticIDs.cpp @@ -502,11 +502,8 @@ DiagnosticIDs::getDiagnosticLevel(unsigned DiagID, unsigned DiagClass, } struct clang::WarningOption { - // Be safe with the size of 'NameLen' because we don't statically check if - // the size will fit in the field; the struct size won't decrease with a - // shorter type anyway. - size_t NameLen; const char *NameStr; + uint16_t NameLen; uint16_t Members; uint16_t SubGroups; @@ -558,7 +555,9 @@ void DiagnosticIDs::getDiagnosticsInGroup( bool DiagnosticIDs::getDiagnosticsInGroup( StringRef Group, SmallVectorImpl &Diags) const { - WarningOption Key = { Group.size(), Group.data(), 0, 0 }; + if (Group.size() > UINT16_MAX) + return true; // Option is too long to be one in the table. + WarningOption Key = { Group.data(), (uint16_t)Group.size(), 0, 0 }; const WarningOption *Found = std::lower_bound(OptionTable, OptionTable + OptionTableSize, Key, WarningOptionCompare); diff --git a/tools/diagtool/DiagnosticNames.h b/tools/diagtool/DiagnosticNames.h index dd5381f028..957a1818e8 100644 --- a/tools/diagtool/DiagnosticNames.h +++ b/tools/diagtool/DiagnosticNames.h @@ -35,11 +35,8 @@ namespace diagtool { struct GroupRecord { - // Be safe with the size of 'NameLen' because we don't statically check if - // the size will fit in the field; the struct size won't decrease with a - // shorter type anyway. - size_t NameLen; const char *NameStr; + uint16_t NameLen; uint16_t Members; uint16_t SubGroups; diff --git a/tools/diagtool/TreeView.cpp b/tools/diagtool/TreeView.cpp index 6298179030..10809c1d8d 100644 --- a/tools/diagtool/TreeView.cpp +++ b/tools/diagtool/TreeView.cpp @@ -94,7 +94,12 @@ static int showGroup(llvm::raw_ostream &out, StringRef RootGroup, bool FlagsOnly) { ArrayRef AllGroups = getDiagnosticGroups(); - GroupRecord Key = { RootGroup.size(), RootGroup.data(), 0, 0 }; + if (RootGroup.size() > UINT16_MAX) { + llvm::errs() << "No such diagnostic group exists\n"; + return 1; + } + + GroupRecord Key = { RootGroup.data(), (uint16_t)RootGroup.size(), 0, 0 }; const GroupRecord *Found = std::lower_bound(AllGroups.begin(), AllGroups.end(), Key); diff --git a/utils/TableGen/ClangDiagnosticsEmitter.cpp b/utils/TableGen/ClangDiagnosticsEmitter.cpp index 135e2e7b8d..9a1cd345a7 100644 --- a/utils/TableGen/ClangDiagnosticsEmitter.cpp +++ b/utils/TableGen/ClangDiagnosticsEmitter.cpp @@ -681,7 +681,6 @@ void EmitClangDiagGroups(RecordKeeper &Records, raw_ostream &OS) { I = DiagsInGroup.begin(), E = DiagsInGroup.end(); I != E; ++I) { // Group option string. OS << " { "; - OS << I->first.size() << ", "; OS << "\""; if (I->first.find_first_not_of("abcdefghijklmnopqrstuvwxyz" "ABCDEFGHIJKLMNOPQRSTUVWXYZ" @@ -690,6 +689,9 @@ void EmitClangDiagGroups(RecordKeeper &Records, raw_ostream &OS) { I->first + "'"); OS.write_escaped(I->first) << "\"," << std::string(MaxLen-I->first.size()+1, ' '); + if (I->first.size() > UINT16_MAX) + PrintFatalError("Diagnostic group name is too long for NameLen field."); + OS << I->first.size() << ", "; // Special handling for 'pedantic'. const bool IsPedantic = I->first == "pedantic"; -- 2.40.0