diff --git a/include/Support/StringExtras.h b/include/Support/StringExtras.h
index 08e5eb7e041..f491e93b840 100644
--- a/include/Support/StringExtras.h
+++ b/include/Support/StringExtras.h
@@ -97,6 +97,16 @@ static inline std::string ftostr(double V) {
   return Buffer;
 }
 
+
+/// getToken - This function extracts one token from source, ignoring any
+/// leading characters that appear in the Delimiters string, and ending the
+/// token at any of the characters that appear in the Delimiters string.  If
+/// there are no tokens in the source string, an empty string is returned.
+/// The Source source string is updated in place to remove the returned string
+/// and any delimiter prefix from it.
+std::string getToken(std::string &Source,
+                     const char *Delimiters = " \t\n\v\f\r");
+
 } // End llvm namespace
 
 #endif
diff --git a/include/llvm/ADT/StringExtras.h b/include/llvm/ADT/StringExtras.h
index 08e5eb7e041..f491e93b840 100644
--- a/include/llvm/ADT/StringExtras.h
+++ b/include/llvm/ADT/StringExtras.h
@@ -97,6 +97,16 @@ static inline std::string ftostr(double V) {
   return Buffer;
 }
 
+
+/// getToken - This function extracts one token from source, ignoring any
+/// leading characters that appear in the Delimiters string, and ending the
+/// token at any of the characters that appear in the Delimiters string.  If
+/// there are no tokens in the source string, an empty string is returned.
+/// The Source source string is updated in place to remove the returned string
+/// and any delimiter prefix from it.
+std::string getToken(std::string &Source,
+                     const char *Delimiters = " \t\n\v\f\r");
+
 } // End llvm namespace
 
 #endif