diff options
author | Chris Lattner <sabre@nondot.org> | 2012-02-05 02:30:40 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2012-02-05 02:30:40 +0000 |
commit | 94010695f7fce626e41ef045b60def9c912e9ce8 (patch) | |
tree | d37f138171025877b562c0f09e89e49bee81ebc2 /lib/CodeGen/CodeGenModule.cpp | |
parent | f7ccbad5d9949e7ddd1cbef43d482553b811e026 (diff) |
reapply the patches reverted in r149477, which enable ConstantDataArray.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@149801 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CodeGenModule.cpp')
-rw-r--r-- | lib/CodeGen/CodeGenModule.cpp | 51 |
1 files changed, 26 insertions, 25 deletions
diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index a35cd7eb94..af6381b1cf 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -696,7 +696,7 @@ llvm::Constant *CodeGenModule::EmitAnnotationString(llvm::StringRef Str) { return i->second; // Not found yet, create a new global. - llvm::Constant *s = llvm::ConstantArray::get(getLLVMContext(), Str, true); + llvm::Constant *s = llvm::ConstantDataArray::getString(getLLVMContext(), Str); llvm::GlobalValue *gv = new llvm::GlobalVariable(getModule(), s->getType(), true, llvm::GlobalValue::PrivateLinkage, s, ".str"); gv->setSection(AnnotationSection); @@ -1852,7 +1852,8 @@ CodeGenModule::GetAddrOfConstantCFString(const StringLiteral *Literal) { llvm::ConstantInt::get(Ty, 0x07C8); // String pointer. - llvm::Constant *C = llvm::ConstantArray::get(VMContext, Entry.getKey().str()); + llvm::Constant *C = llvm::ConstantDataArray::getString(VMContext, + Entry.getKey()); llvm::GlobalValue::LinkageTypes Linkage; if (isUTF16) @@ -1984,7 +1985,8 @@ CodeGenModule::GetAddrOfConstantString(const StringLiteral *Literal) { Fields[0] = ConstantStringClassRef; // String pointer. - llvm::Constant *C = llvm::ConstantArray::get(VMContext, Entry.getKey().str()); + llvm::Constant *C = + llvm::ConstantDataArray::getString(VMContext, Entry.getKey()); llvm::GlobalValue::LinkageTypes Linkage; bool isConstant; @@ -2080,29 +2082,28 @@ CodeGenModule::GetConstantArrayFromStringLiteral(const StringLiteral *E) { // Don't emit it as the address of the string, emit the string data itself // as an inline array. if (E->getCharByteWidth()==1) { - return llvm::ConstantArray::get(VMContext, + return llvm::ConstantDataArray::getString(VMContext, GetStringForStringLiteral(E), false); - } else { - llvm::ArrayType *AType = - cast<llvm::ArrayType>(getTypes().ConvertType(E->getType())); - llvm::Type *ElemTy = AType->getElementType(); - unsigned NumElements = AType->getNumElements(); - std::vector<llvm::Constant*> Elts; - Elts.reserve(NumElements); - - for(unsigned i=0;i<E->getLength();++i) { - unsigned value = E->getCodeUnit(i); - llvm::Constant *C = llvm::ConstantInt::get(ElemTy,value,false); - Elts.push_back(C); - } - for(unsigned i=E->getLength();i<NumElements;++i) { - llvm::Constant *C = llvm::ConstantInt::get(ElemTy,0,false); - Elts.push_back(C); - } - - return llvm::ConstantArray::get(AType, Elts); } - + + llvm::ArrayType *AType = + cast<llvm::ArrayType>(getTypes().ConvertType(E->getType())); + llvm::Type *ElemTy = AType->getElementType(); + unsigned NumElements = AType->getNumElements(); + std::vector<llvm::Constant*> Elts; + Elts.reserve(NumElements); + + for(unsigned i=0;i<E->getLength();++i) { + unsigned value = E->getCodeUnit(i); + llvm::Constant *C = llvm::ConstantInt::get(ElemTy,value,false); + Elts.push_back(C); + } + for(unsigned i=E->getLength();i<NumElements;++i) { + llvm::Constant *C = llvm::ConstantInt::get(ElemTy,0,false); + Elts.push_back(C); + } + + return llvm::ConstantArray::get(AType, Elts); } /// GetAddrOfConstantStringFromLiteral - Return a pointer to a @@ -2151,7 +2152,7 @@ static llvm::GlobalVariable *GenerateStringLiteral(StringRef str, unsigned Alignment) { // Create Constant for this string literal. Don't add a '\0'. llvm::Constant *C = - llvm::ConstantArray::get(CGM.getLLVMContext(), str, false); + llvm::ConstantDataArray::getString(CGM.getLLVMContext(), str, false); // Create a global variable for this string llvm::GlobalVariable *GV = |