From ec586e7b10394aeed25c8e5ee02d230951826136 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Thu, 23 Jul 2009 20:38:28 +0000 Subject: [PATCH] Simplify, NFC. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@76897 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CodeGenModule.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index 4321765607..c417cf8ec9 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/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]; -- 2.40.0