diff options
| author | Steve Naroff <snaroff@apple.com> | 2009-03-31 16:53:37 +0000 |
|---|---|---|
| committer | Steve Naroff <snaroff@apple.com> | 2009-03-31 16:53:37 +0000 |
| commit | 33fdb738a6c125f4c788733897021b7c1a062b0c (patch) | |
| tree | 193ee0bf045898b9be68d4024138264056cae96a /lib/CodeGen/CGObjCMac.cpp | |
| parent | 8499f3f5ff8d5f95ece8047780030a3daad1b6fa (diff) | |
Some "prep" work for handling ObjC @-string constants that contain UTF-8. No functionality change.
Changed GenerateConstantString() to take an ObjCStringLiteral (instead of a std::string). While this isn't strictly necessary, it seems cleaner and allows us to cache to "containsNonAscii" if necessary (to avoid checking in both Sema and CodeGen).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@68114 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGObjCMac.cpp')
| -rw-r--r-- | lib/CodeGen/CGObjCMac.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/CodeGen/CGObjCMac.cpp b/lib/CodeGen/CGObjCMac.cpp index 05d81eaf0f..f688029fb2 100644 --- a/lib/CodeGen/CGObjCMac.cpp +++ b/lib/CodeGen/CGObjCMac.cpp @@ -487,7 +487,7 @@ public: CGObjCCommonMac(CodeGen::CodeGenModule &cgm) : CGM(cgm) { } - virtual llvm::Constant *GenerateConstantString(const std::string &String); + virtual llvm::Constant *GenerateConstantString(const ObjCStringLiteral *SL); virtual llvm::Function *GenerateMethod(const ObjCMethodDecl *OMD, const ObjCContainerDecl *CD=0); @@ -899,8 +899,13 @@ llvm::Value *CGObjCMac::GetSelector(CGBuilderTy &Builder, Selector Sel) { */ llvm::Constant *CGObjCCommonMac::GenerateConstantString( - const std::string &String) { - return CGM.GetAddrOfConstantCFString(String); + 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); } /// Generates a message send where the super is the receiver. This is |