diff options
| -rw-r--r-- | lib/Option/OptTable.cpp | 9 | ||||
| -rw-r--r-- | tools/bugpoint/ToolRunner.cpp | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/lib/Option/OptTable.cpp b/lib/Option/OptTable.cpp index 78c5ea2..6fa459a 100644 --- a/lib/Option/OptTable.cpp +++ b/lib/Option/OptTable.cpp @@ -175,13 +175,6 @@ static bool isInput(const llvm::StringSet<> &Prefixes, StringRef Arg) { return true; } -// Returns true if X starts with Y, ignoring case. -static bool startsWithIgnoreCase(StringRef X, StringRef Y) { - if (X.size() < Y.size()) - return false; - return X.substr(0, Y.size()).equals_lower(Y); -} - /// \returns Matched size. 0 means no match. static unsigned matchOption(const OptTable::Info *I, StringRef Str, bool IgnoreCase) { @@ -190,7 +183,7 @@ static unsigned matchOption(const OptTable::Info *I, StringRef Str, if (Str.startswith(Prefix)) { StringRef Rest = Str.substr(Prefix.size()); bool Matched = IgnoreCase - ? startsWithIgnoreCase(Rest, I->Name) + ? Rest.startswith_lower(I->Name) : Rest.startswith(I->Name); if (Matched) return Prefix.size() + StringRef(I->Name).size(); diff --git a/tools/bugpoint/ToolRunner.cpp b/tools/bugpoint/ToolRunner.cpp index 107d0db..254d997 100644 --- a/tools/bugpoint/ToolRunner.cpp +++ b/tools/bugpoint/ToolRunner.cpp @@ -662,7 +662,7 @@ static bool IsARMArchitecture(std::vector<const char*> Args) { I = Args.begin(), E = Args.end(); I != E; ++I) { if (StringRef(*I).equals_lower("-arch")) { ++I; - if (I != E && StringRef(*I).substr(0, strlen("arm")).equals_lower("arm")) + if (I != E && StringRef(*I).startswith_lower("arm")) return true; } } |