diff --git a/clang/lib/AST/StmtProfile.cpp b/clang/lib/AST/StmtProfile.cpp
index c4d42f6be228..5a5badd28910 100644
--- a/clang/lib/AST/StmtProfile.cpp
+++ b/clang/lib/AST/StmtProfile.cpp
@@ -237,7 +237,7 @@ void StmtProfiler::VisitImaginaryLiteral(ImaginaryLiteral *S) {
 
 void StmtProfiler::VisitStringLiteral(StringLiteral *S) {
   VisitExpr(S);
-  ID.AddString(S->getString());
+  ID.AddString(S->getStrData(), S->getStrData() + S->getByteLength());
   ID.AddBoolean(S->isWide());
 }
 
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp
index ac0c6c3faeca..af9f7e91f3f0 100644
--- a/clang/lib/CodeGen/CodeGenModule.cpp
+++ b/clang/lib/CodeGen/CodeGenModule.cpp
@@ -1310,12 +1310,15 @@ GetConstantCFStringEntry(llvm::StringMap<llvm::Constant*> &Map,
                          bool TargetIsLSB,
                          bool &IsUTF16,
                          unsigned &StringLength) {
-  // Check for simple case.
-  if (!Literal->containsNonAsciiOrNull())
-    return Map.GetOrCreateValue(Literal->getString());
-
   unsigned NumBytes = Literal->getByteLength();
 
+  // Check for simple case.
+  if (!Literal->containsNonAsciiOrNull()) {
+    StringLength = NumBytes;
+    return Map.GetOrCreateValue(llvm::StringRef(Literal->getStrData(),
+                                                StringLength));
+  }
+
   // Otherwise, convert the UTF8 literals into a byte string.
   llvm::SmallVector<UTF16, 128> ToBuf(NumBytes);
   const UTF8 *FromPtr = (UTF8 *)Literal->getStrData();
@@ -1330,7 +1333,9 @@ GetConstantCFStringEntry(llvm::StringMap<llvm::Constant*> &Map,
     // FIXME: Have Sema::CheckObjCString() validate the UTF-8 string and remove
     // this duplicate code.
     assert(Result == sourceIllegal && "UTF-8 to UTF-16 conversion failed");
-    return Map.GetOrCreateValue(Literal->getString());
+    StringLength = NumBytes;
+    return Map.GetOrCreateValue(llvm::StringRef(Literal->getStrData(),
+                                                StringLength));
   }
 
   // ConvertUTF8toUTF16 returns the length in ToPtr.
diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp
index 0da06a99d595..1e26c3507bbf 100644
--- a/clang/lib/Sema/SemaChecking.cpp
+++ b/clang/lib/Sema/SemaChecking.cpp
@@ -447,13 +447,17 @@ bool Sema::CheckObjCString(Expr *Arg) {
     return true;
   }
 
-  llvm::StringRef Str = Literal->getString();
-  size_t NullLoc = Str.find('\0');
+  const char *Data = Literal->getStrData();
+  unsigned Length = Literal->getByteLength();
 
-  if (NullLoc != llvm::StringRef::npos)
-    Diag(getLocationOfStringLiteralByte(Literal, NullLoc),
-         diag::warn_cfstring_literal_contains_nul_character)
-      << Arg->getSourceRange();
+  for (unsigned i = 0; i < Length; ++i) {
+    if (!Data[i]) {
+      Diag(getLocationOfStringLiteralByte(Literal, i),
+           diag::warn_cfstring_literal_contains_nul_character)
+        << Arg->getSourceRange();
+      break;
+    }
+  }
 
   return false;
 }