First cut of ARM/MC/ELF PIC relocations.

[oota-llvm.git] / lib / Support / StringExtras.cpp

diff --git a/lib/Support/StringExtras.cpp b/lib/Support/StringExtras.cpp
index 7fd840b0aed90159564886a6004b340fbf5c9473..eb2fa084218aef31b157cddb31af44e29ed73c98 100644 (file)
--- a/lib/Support/StringExtras.cpp
+++ b/lib/Support/StringExtras.cpp
@@ -39,13 +39,11 @@ std::pair<StringRef, StringRef> llvm::getToken(StringRef Source,
                                                StringRef Delimiters) {
   // Figure out where the token starts.
   StringRef::size_type Start = Source.find_first_not_of(Delimiters);
-  if (Start == StringRef::npos) Start = Source.size();
 
   // Find the next occurrence of the delimiter.
   StringRef::size_type End = Source.find_first_of(Delimiters, Start);
-  if (End == StringRef::npos) End = Source.size();
 
-  return std::make_pair(Source.substr(Start, End), Source.substr(End));
+  return std::make_pair(Source.slice(Start, End), Source.substr(End));
 }
 
 /// SplitString - Split up the specified string according to the specified
@@ -61,18 +59,6 @@ void llvm::SplitString(StringRef Source,
   }
 }
 
-// FIXME: remove when llvm-gcc doesn't use this anymore
-void llvm::SplitString(StringRef Source,
-                       std::vector<std::string> &OutFragments,
-                       StringRef Delimiters) {
-  StringRef S2, S;
-  tie(S2, S) = getToken(Source, Delimiters);
-  while (!S2.empty()) {
-    OutFragments.push_back(S2);
-    tie(S2, S) = getToken(S, Delimiters);
-  }
-}
-
 void llvm::StringRef::split(SmallVectorImpl<StringRef> &A,
                             StringRef Separators, int MaxSplit,
                             bool KeepEmpty) const {