nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Switch a few clients over to StringLiteral::getString.", this is breaking some projects, but I don't have a test case yet.

Browse Source 
llvm-svn: 82539
This commit is contained in:
Daniel Dunbar
2009-09-22 10:03:52 +00:00
parent 99e1174baf
commit b879c3c125
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
clang/lib/CodeGen/CodeGenModule.cpp
View File

@@ -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.