diff options
| author | Owen Anderson <resistor@mac.com> | 2009-07-27 22:29:56 +0000 |
|---|---|---|
| committer | Owen Anderson <resistor@mac.com> | 2009-07-27 22:29:56 +0000 |
| commit | 08e252425ca2cbdc44ba65d9a657ed5398014e36 (patch) | |
| tree | 0b4e6d25326e28299913d7839e402e08311e8998 /lib/CodeGen/CGBlocks.cpp | |
| parent | e24aea225ec87b935ede6c21c964dd47a4afb810 (diff) | |
Update for LLVM API change.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@77267 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGBlocks.cpp')
| -rw-r--r-- | lib/CodeGen/CGBlocks.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/CodeGen/CGBlocks.cpp b/lib/CodeGen/CGBlocks.cpp index 0bcacd1e48..1bac84d269 100644 --- a/lib/CodeGen/CGBlocks.cpp +++ b/lib/CodeGen/CGBlocks.cpp @@ -29,8 +29,6 @@ BuildDescriptorBlockDecl(bool BlockHasCopyDispose, uint64_t Size, llvm::Constant *C; std::vector<llvm::Constant*> Elts; - llvm::LLVMContext &VMContext = CGM.getLLVMContext(); - // reserved C = llvm::ConstantInt::get(UnsignedLongTy, 0); Elts.push_back(C); @@ -50,7 +48,7 @@ BuildDescriptorBlockDecl(bool BlockHasCopyDispose, uint64_t Size, Elts.push_back(BuildDestroyHelper(Ty, NoteForHelper)); } - C = VMContext.getConstantStruct(Elts); + C = llvm::ConstantStruct::get(Elts); C = new llvm::GlobalVariable(CGM.getModule(), C->getType(), true, llvm::GlobalValue::InternalLinkage, @@ -163,7 +161,7 @@ llvm::Value *CodeGenFunction::BuildBlockLiteralTmp(const BlockExpr *BE) { Elts[0] = CGM.getNSConcreteGlobalBlock(); Elts[1] = llvm::ConstantInt::get(IntTy, flags|BLOCK_IS_GLOBAL); - C = VMContext.getConstantStruct(Elts); + C = llvm::ConstantStruct::get(Elts); char Name[32]; sprintf(Name, "__block_holder_tmp_%d", CGM.getGlobalUniqueCount()); @@ -513,7 +511,7 @@ BlockModule::GetAddrOfGlobalBlock(const BlockExpr *BE, const char * n) { llvm::ConstantInt::get(UnsignedLongTy,BlockLiteralSize); llvm::Constant *DescriptorStruct = - VMContext.getConstantStruct(&DescriptorFields[0], 2); + llvm::ConstantStruct::get(&DescriptorFields[0], 2); llvm::GlobalVariable *Descriptor = new llvm::GlobalVariable(getModule(), DescriptorStruct->getType(), true, @@ -554,7 +552,7 @@ BlockModule::GetAddrOfGlobalBlock(const BlockExpr *BE, const char * n) { LiteralFields[4] = Descriptor; llvm::Constant *BlockLiteralStruct = - VMContext.getConstantStruct(&LiteralFields[0], 5); + llvm::ConstantStruct::get(&LiteralFields[0], 5); llvm::GlobalVariable *BlockLiteral = new llvm::GlobalVariable(getModule(), BlockLiteralStruct->getType(), true, |