[llvm] r190375 - Use StringRef::npos for StringRef instead of std::string one

Matt Arsenault Matthew.Arsenault at amd.com
Mon Sep 9 17:41:53 PDT 2013


Author: arsenm
Date: Mon Sep  9 19:41:53 2013
New Revision: 190375

URL: http://llvm.org/viewvc/llvm-project?rev=190375&view=rev
Log:
Use StringRef::npos for StringRef instead of std::string one

Modified:
    llvm/trunk/lib/Transforms/Utils/SimplifyLibCalls.cpp

Modified: llvm/trunk/lib/Transforms/Utils/SimplifyLibCalls.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/SimplifyLibCalls.cpp?rev=190375&r1=190374&r2=190375&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Utils/SimplifyLibCalls.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/SimplifyLibCalls.cpp Mon Sep  9 19:41:53 2013
@@ -789,7 +789,7 @@ struct StrPBrkOpt : public LibCallOptimi
     // Constant folding.
     if (HasS1 && HasS2) {
       size_t I = S1.find_first_of(S2);
-      if (I == std::string::npos) // No match.
+      if (I == StringRef::npos) // No match.
         return Constant::getNullValue(CI->getType());
 
       return B.CreateGEP(CI->getArgOperand(0), B.getInt64(I), "strpbrk");
@@ -927,7 +927,7 @@ struct StrStrOpt : public LibCallOptimiz
 
     // If both strings are known, constant fold it.
     if (HasStr1 && HasStr2) {
-      std::string::size_type Offset = SearchStr.find(ToFindStr);
+      size_t Offset = SearchStr.find(ToFindStr);
 
       if (Offset == StringRef::npos) // strstr("foo", "bar") -> null
         return Constant::getNullValue(CI->getType());
@@ -1384,7 +1384,7 @@ struct PrintFOpt : public LibCallOptimiz
 
     // printf("foo\n") --> puts("foo")
     if (FormatStr[FormatStr.size()-1] == '\n' &&
-        FormatStr.find('%') == std::string::npos) {  // no format characters.
+        FormatStr.find('%') == StringRef::npos) { // No format characters.
       // Create a string literal with no \n on it.  We expect the constant merge
       // pass to be run after this pass, to merge duplicate strings.
       FormatStr = FormatStr.drop_back();





More information about the llvm-commits mailing list