From 2a5b83c7e6c1019cecefed1f5d14280b3b358287 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Thu, 23 Jul 2009 20:38:28 +0000 Subject: Simplify, NFC. llvm-svn: 76897 --- clang/lib/CodeGen/CodeGenModule.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'clang/lib/CodeGen/CodeGenModule.cpp') diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index 432176560768..c417cf8ec932 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -1215,16 +1215,15 @@ GetAddrOfConstantCFString(const StringLiteral *Literal) { StringLength = ToPtr-&ToBuf[0]; str.assign((char *)&ToBuf[0], StringLength*2);// Twice as many UTF8 chars. isUTF16 = true; - } else if (Result == sourceIllegal) { + } else { + assert(Result == sourceIllegal && "UTF-8 to UTF-16 conversion failed"); // FIXME: Have Sema::CheckObjCString() validate the UTF-8 string. - str.assign(Literal->getStrData(), Literal->getByteLength()); - StringLength = str.length(); - } else - assert(Result == conversionOK && "UTF-8 to UTF-16 conversion failed"); - + StringLength = Literal->getByteLength(); + str.assign(Literal->getStrData(), StringLength); + } } else { - str.assign(Literal->getStrData(), Literal->getByteLength()); - StringLength = str.length(); + StringLength = Literal->getByteLength(); + str.assign(Literal->getStrData(), StringLength); } llvm::Constant *&Entry = CFConstantStringMap[str]; -- cgit v1.2.3