diff options
| -rw-r--r-- | lib/AST/StmtProfile.cpp | 2 | ||||
| -rw-r--r-- | lib/CodeGen/CodeGenModule.cpp | 15 | ||||
| -rw-r--r-- | lib/Sema/SemaChecking.cpp | 18 |
3 files changed, 13 insertions, 22 deletions
diff --git a/lib/AST/StmtProfile.cpp b/lib/AST/StmtProfile.cpp index 5a5badd289..c4d42f6be2 100644 --- a/lib/AST/StmtProfile.cpp +++ b/lib/AST/StmtProfile.cpp @@ -237,7 +237,7 @@ void StmtProfiler::VisitImaginaryLiteral(ImaginaryLiteral *S) { void StmtProfiler::VisitStringLiteral(StringLiteral *S) { VisitExpr(S); - ID.AddString(S->getStrData(), S->getStrData() + S->getByteLength()); + ID.AddString(S->getString()); ID.AddBoolean(S->isWide()); } diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index af9f7e91f3..ac0c6c3fae 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -1310,14 +1310,11 @@ GetConstantCFStringEntry(llvm::StringMap<llvm::Constant*> &Map, bool TargetIsLSB, bool &IsUTF16, unsigned &StringLength) { - unsigned NumBytes = Literal->getByteLength(); - // Check for simple case. - if (!Literal->containsNonAsciiOrNull()) { - StringLength = NumBytes; - return Map.GetOrCreateValue(llvm::StringRef(Literal->getStrData(), - StringLength)); - } + if (!Literal->containsNonAsciiOrNull()) + return Map.GetOrCreateValue(Literal->getString()); + + unsigned NumBytes = Literal->getByteLength(); // Otherwise, convert the UTF8 literals into a byte string. llvm::SmallVector<UTF16, 128> ToBuf(NumBytes); @@ -1333,9 +1330,7 @@ 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"); - StringLength = NumBytes; - return Map.GetOrCreateValue(llvm::StringRef(Literal->getStrData(), - StringLength)); + return Map.GetOrCreateValue(Literal->getString()); } // ConvertUTF8toUTF16 returns the length in ToPtr. 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; } |