From 353149ea2f8d4d3bf1ec82e90f80154c6959d56e Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Mon, 19 Aug 2013 00:24:20 +0000 Subject: [PATCH] Remove SpecialCaseList::findCategory. It turned out that I didn't need this for DFSan. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@188646 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../llvm/Transforms/Utils/SpecialCaseList.h | 16 --------- lib/Transforms/Utils/SpecialCaseList.cpp | 35 ------------------- .../Transforms/Utils/SpecialCaseList.cpp | 2 -- 3 files changed, 53 deletions(-) diff --git a/include/llvm/Transforms/Utils/SpecialCaseList.h b/include/llvm/Transforms/Utils/SpecialCaseList.h index bf95ec02b9c..90eace1aa04 100644 --- a/include/llvm/Transforms/Utils/SpecialCaseList.h +++ b/include/llvm/Transforms/Utils/SpecialCaseList.h @@ -83,20 +83,6 @@ class SpecialCaseList { /// omitted to search the empty category. bool isIn(const Module &M, const StringRef Category = StringRef()) const; - /// Returns whether either this function or its source file are listed in any - /// category. Category will contain the name of an arbitrary category in - /// which this function is listed. - bool findCategory(const Function &F, StringRef &Category) const; - - /// Returns whether this global, its type or its source file are listed in any - /// category. Category will contain the name of an arbitrary category in - /// which this global is listed. - bool findCategory(const GlobalVariable &G, StringRef &Category) const; - - /// Returns whether this module is listed in any category. Category will - /// contain the name of an arbitrary category in which this module is listed. - bool findCategory(const Module &M, StringRef &Category) const; - private: SpecialCaseList(SpecialCaseList const &) LLVM_DELETED_FUNCTION; SpecialCaseList &operator=(SpecialCaseList const &) LLVM_DELETED_FUNCTION; @@ -108,8 +94,6 @@ class SpecialCaseList { /// Parses just-constructed SpecialCaseList entries from a memory buffer. bool parse(const MemoryBuffer *MB, std::string &Error); - bool findCategory(const StringRef Section, const StringRef Query, - StringRef &Category) const; bool inSectionCategory(const StringRef Section, const StringRef Query, const StringRef Category) const; }; diff --git a/lib/Transforms/Utils/SpecialCaseList.cpp b/lib/Transforms/Utils/SpecialCaseList.cpp index 5400bcd60bf..cf12bbfe3d7 100644 --- a/lib/Transforms/Utils/SpecialCaseList.cpp +++ b/lib/Transforms/Utils/SpecialCaseList.cpp @@ -169,12 +169,6 @@ SpecialCaseList::~SpecialCaseList() { } } -bool SpecialCaseList::findCategory(const Function &F, - StringRef &Category) const { - return findCategory(*F.getParent(), Category) || - findCategory("fun", F.getName(), Category); -} - bool SpecialCaseList::isIn(const Function& F, const StringRef Category) const { return isIn(*F.getParent(), Category) || inSectionCategory("fun", F.getName(), Category); @@ -191,13 +185,6 @@ static StringRef GetGVTypeString(const GlobalVariable &G) { return ""; } -bool SpecialCaseList::findCategory(const GlobalVariable &G, - StringRef &Category) const { - return findCategory(*G.getParent(), Category) || - findCategory("global", G.getName(), Category) || - findCategory("type", GetGVTypeString(G), Category); -} - bool SpecialCaseList::isIn(const GlobalVariable &G, const StringRef Category) const { return isIn(*G.getParent(), Category) || @@ -205,32 +192,10 @@ bool SpecialCaseList::isIn(const GlobalVariable &G, inSectionCategory("type", GetGVTypeString(G), Category); } -bool SpecialCaseList::findCategory(const Module &M, StringRef &Category) const { - return findCategory("src", M.getModuleIdentifier(), Category); -} - bool SpecialCaseList::isIn(const Module &M, const StringRef Category) const { return inSectionCategory("src", M.getModuleIdentifier(), Category); } -bool SpecialCaseList::findCategory(const StringRef Section, - const StringRef Query, - StringRef &Category) const { - StringMap >::const_iterator I = Entries.find(Section); - if (I == Entries.end()) return false; - - for (StringMap::const_iterator II = I->second.begin(), - IE = I->second.end(); - II != IE; ++II) { - if (II->getValue().match(Query)) { - Category = II->first(); - return true; - } - } - - return false; -} - bool SpecialCaseList::inSectionCategory(const StringRef Section, const StringRef Query, const StringRef Category) const { diff --git a/unittests/Transforms/Utils/SpecialCaseList.cpp b/unittests/Transforms/Utils/SpecialCaseList.cpp index 42900b79a26..92a730d5992 100644 --- a/unittests/Transforms/Utils/SpecialCaseList.cpp +++ b/unittests/Transforms/Utils/SpecialCaseList.cpp @@ -94,8 +94,6 @@ TEST_F(SpecialCaseListTest, FunctionIsIn) { SCL.reset(makeSpecialCaseList("fun:foo=functional\n")); EXPECT_TRUE(SCL->isIn(*Foo, "functional")); StringRef Category; - EXPECT_TRUE(SCL->findCategory(*Foo, Category)); - EXPECT_EQ("functional", Category); EXPECT_FALSE(SCL->isIn(*Bar, "functional")); }