From 5de27daf93c167a0108d8549db3f89055656a0e7 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Tue, 22 Sep 2009 03:27:52 +0000 Subject: Switch a few clients over to StringLiteral::getString. - Switching all of them out-of-my-current-scope-of-interest, sorry. llvm-svn: 82515 --- clang/lib/CodeGen/CodeGenModule.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'clang/lib/CodeGen/CodeGenModule.cpp') diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index af9f7e9..ac0c6c3 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -1310,14 +1310,11 @@ GetConstantCFStringEntry(llvm::StringMap &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 ToBuf(NumBytes); @@ -1333,9 +1330,7 @@ GetConstantCFStringEntry(llvm::StringMap &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. -- cgit v1.1