Remove bogus assertion. This unbreaks mingw, where ConstantSDNode

[oota-llvm.git] / include / llvm / ADT / StringExtras.h

diff --git a/include/llvm/ADT/StringExtras.h b/include/llvm/ADT/StringExtras.h
index e3b3c8770a24abbdd97ac498da296c4e22112f31..87b8ba6596a18a1d7aab1b2b973cd3354d7ea6a0 100644 (file)
--- a/include/llvm/ADT/StringExtras.h
+++ b/include/llvm/ADT/StringExtras.h
@@ -143,14 +143,17 @@ static inline bool StringsEqualNoCase(const std::string &LHS,
 }
   
 /// CStrInCStrNoCase - Portable version of strcasestr.  Locates the first
-///  occurance of c-string 's1' in string 's2', ignoring case.  Returns
-///  NULL if 's1' cannot be found.
+///  occurance of c-string 's2' in string 's1', ignoring case.  Returns
+///  NULL if 's2' cannot be found.
 static inline const char* CStrInCStrNoCase(const char *s1, const char *s2) {
 
   // Are either strings NULL or empty?
   if (!s1 || !s2 || s1[0] == '\0' || s2[0] == '\0')
     return 0;
   
+  if (s1 == s2)
+    return s1;
+  
   const char *I1=s1, *I2=s2;
   
   while (*I1 != '\0' || *I2 != '\0' )
@@ -161,9 +164,8 @@ static inline const char* CStrInCStrNoCase(const char *s1, const char *s2) {
       ++I1; ++I2;
     }
 
-  // If we exhausted all of the characters in 's2', then 's1' does not occur
-  // in it.
-  return *I2 == '\0' ? 0 : I1;
+  // If we exhausted all of the characters in 's2', then 's2' appears in 's1'.
+  return *I2 == '\0' ? s1 : 0;
 }
 
 /// getToken - This function extracts one token from source, ignoring any