RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 10:42:39 +01:00
Code Issues Projects Releases Wiki Activity

Re-apply r200853, which should not crash after Clang plugins were converted to loadable modules in r201256.

Browse Source 
llvm-svn: 202404
This commit is contained in:
Alexander Kornienko 2014-02-27 14:47:37 +00:00
parent f8fb4e8a7f
commit 4ec82215fc
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/llvm/Support/CommandLine.h
View File

@ -149,8 +149,8 @@ private:
public:
OptionCategory(const char *const Name, const char *const Description = 0)
: Name(Name), Description(Description) { registerCategory(); }
const char *getName() { return Name; }
const char *getDescription() { return Description; }
const char *getName() const { return Name; }
const char *getDescription() const { return Description; }
};
// The general Option Category (used as default category).

20
lib/Support/CommandLine.cpp
View File

@ -36,7 +36,6 @@
#include <cerrno>
#include <cstdlib>
#include <map>
#include <set>
using namespace llvm;
using namespace cl;
@ -126,8 +125,21 @@ static ManagedStatic<OptionCatSet> RegisteredOptionCategories;
// Initialise the general option category.
OptionCategory llvm::cl::GeneralCategory("General options");
struct HasName {
HasName(StringRef Name) : Name(Name) {}
bool operator()(const OptionCategory *Category) const {
return Name == Category->getName();
}
StringRef Name;
};
void OptionCategory::registerCategory()
{
assert(std::count_if(RegisteredOptionCategories->begin(),
RegisteredOptionCategories->end(),
HasName(getName())) == 0 &&
"Duplicate option categories");
RegisteredOptionCategories->insert(this);
}
@ -1506,7 +1518,6 @@ protected:
virtual void printOptions(StrOptionPairVector &Opts, size_t MaxArgLen) {
std::vector<OptionCategory *> SortedCategories;
std::map<OptionCategory *, std::vector<Option *> > CategorizedOptions;
std::set<std::string> CategoryNames;
// Collect registered option categories into vector in preparation for
// sorting.
@ -1514,11 +1525,6 @@ protected:
E = RegisteredOptionCategories->end();
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.