maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

More "prep" work for handling UTF16 CFString. 

Patch by Jean-Daniel Dupas. Thanks!

llvm-svn: 68203
This commit is contained in:
Steve Naroff 2009-04-01 13:55:36 +00:00
parent c94adda157
commit e14b368fa9
5 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/include/clang/AST/Expr.h
View File

@ -533,9 +533,9 @@ public:
const char *getStrData() const { return StrData; }
unsigned getByteLength() const { return ByteLength; }
bool isWide() const { return IsWide; }
bool containsNonAscii() const {
bool containsNonAsciiOrNull() const {
for (unsigned i = 0; i < getByteLength(); ++i)
if (!isascii(getStrData()[i]))
if (!isascii(getStrData()[i]) || !getStrData()[i])
return true;
return false;
}

3
clang/lib/CodeGen/CGExprConstant.cpp
View File

@ -442,9 +442,8 @@ public:
break;
const Expr *Arg = CE->getArg(0)->IgnoreParenCasts();
const StringLiteral *Literal = cast<StringLiteral>(Arg);
std::string S(Literal->getStrData(), Literal->getByteLength());
// FIXME: need to deal with UCN conversion issues.
return CGM.GetAddrOfConstantCFString(S);
return CGM.GetAddrOfConstantCFString(Literal);
}
case Expr::BlockExprClass: {
std::string FunctionName;

7
clang/lib/CodeGen/CGObjCMac.cpp
View File

@ -900,12 +900,7 @@ llvm::Value *CGObjCMac::GetSelector(CGBuilderTy &Builder, Selector Sel) {
llvm::Constant *CGObjCCommonMac::GenerateConstantString(
const ObjCStringLiteral *SL) {
std::string Str(SL->getString()->getStrData(),
SL->getString()->getByteLength());
if (SL->getString()->containsNonAscii()) {
// FIXME: Convert from UTF-8 to UTF-16.
}
return CGM.GetAddrOfConstantCFString(Str);
return CGM.GetAddrOfConstantCFString(SL->getString());
}
/// Generates a message send where the super is the receiver. This is

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

@ -1002,7 +1002,11 @@ static void appendFieldAndPadding(CodeGenModule &CGM,
// We still need to work out the details of handling UTF-16.
// See: <rdr://2996215>
llvm::Constant *CodeGenModule::
GetAddrOfConstantCFString(const std::string &str) {
GetAddrOfConstantCFString(const StringLiteral *Literal) {
// if (Literal->containsNonAsciiOrNull()) {
// // FIXME: Convert from UTF-8 to UTF-16.
// }
std::string str(Literal->getStrData(), Literal->getByteLength());
llvm::StringMapEntry<llvm::Constant *> &Entry =
CFConstantStringMap.GetOrCreateValue(&str[0], &str[str.length()]);

2
clang/lib/CodeGen/CodeGenModule.h
View File

@ -187,7 +187,7 @@ public:
/// GetAddrOfConstantCFString - Return a pointer to a constant CFString object
/// for the given string.
llvm::Constant *GetAddrOfConstantCFString(const std::string& str);
llvm::Constant *GetAddrOfConstantCFString(const StringLiteral *Literal);
/// GetAddrOfConstantStringFromLiteral - Return a pointer to a constant array
/// for the given string literal.