1 files changed, 7 insertions, 11 deletions
diff --git a/lib/Sema/SemaChecking.cpp b/lib/Sema/SemaChecking.cpp
index 1e26c3507b..0da06a99d5 100644
--- a/lib/Sema/SemaChecking.cpp
+++ b/lib/Sema/SemaChecking.cpp
@@ -447,17 +447,13 @@ bool Sema::CheckObjCString(Expr *Arg) {
     return true;
   }
 
-  const char *Data = Literal->getStrData();
-  unsigned Length = Literal->getByteLength();
-
-  for (unsigned i = 0; i < Length; ++i) {
-    if (!Data[i]) {
-      Diag(getLocationOfStringLiteralByte(Literal, i),
-           diag::warn_cfstring_literal_contains_nul_character)
-        << Arg->getSourceRange();
-      break;
-    }
-  }
+  llvm::StringRef Str = Literal->getString();
+  size_t NullLoc = Str.find('\0');
+
+  if (NullLoc != llvm::StringRef::npos)
+    Diag(getLocationOfStringLiteralByte(Literal, NullLoc),
+         diag::warn_cfstring_literal_contains_nul_character)
+      << Arg->getSourceRange();
 
   return false;
 }