From 11b8b431964b870e3021a8eca8bf1d870a58f474 Mon Sep 17 00:00:00 2001 From: Alexander Kornienko Date: Fri, 7 Feb 2014 17:42:30 +0000 Subject: [PATCH] Fix an invalid check for duplicate option categories. An intermediate solution until the problems with analyzer plugins linking with llvm/Support and causing assertions due to duplicate GeneralCategory are solved. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@200981 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Support/CommandLine.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/Support/CommandLine.cpp b/lib/Support/CommandLine.cpp index 16db4d63960..7b2a4d0270f 100644 --- a/lib/Support/CommandLine.cpp +++ b/lib/Support/CommandLine.cpp @@ -36,6 +36,7 @@ #include #include #include +#include using namespace llvm; using namespace cl; @@ -1495,9 +1496,7 @@ public: // It shall return true if A's name should be lexographically // ordered before B's name. It returns false otherwise. static bool OptionCategoryCompare(OptionCategory *A, OptionCategory *B) { - int Length = strcmp(A->getName(), B->getName()); - assert(Length != 0 && "Duplicate option categories"); - return Length < 0; + return strcmp(A->getName(), B->getName()) < 0; } // Make sure we inherit our base class's operator=() @@ -1507,13 +1506,20 @@ protected: virtual void printOptions(StrOptionPairVector &Opts, size_t MaxArgLen) { std::vector SortedCategories; std::map > CategorizedOptions; + std::set CategoryNames; // Collect registered option categories into vector in preparation for // sorting. for (OptionCatSet::const_iterator I = RegisteredOptionCategories->begin(), E = RegisteredOptionCategories->end(); - I != E; ++I) + I != E; ++I) { SortedCategories.push_back(*I); + // FIXME: Move this check to OptionCategory::registerCategory after the + // problem with analyzer plugins linking to llvm/Support and causing + // assertion on the duplicate llvm::cl::GeneralCategory is solved. + assert(CategoryNames.insert((*I)->getName()).second && + "Duplicate option categories"); + } // Sort the different option categories alphabetically. assert(SortedCategories.size() > 0 && "No option categories registered!"); -- 2.34.1