diff options
Diffstat (limited to 'clang/lib/CodeGen')
| -rw-r--r-- | clang/lib/CodeGen/CGObjCMac.cpp | 3 | ||||
| -rw-r--r-- | clang/lib/CodeGen/CGObjCRuntime.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGObjCMac.cpp b/clang/lib/CodeGen/CGObjCMac.cpp index c29b435b978..641d1571382 100644 --- a/clang/lib/CodeGen/CGObjCMac.cpp +++ b/clang/lib/CodeGen/CGObjCMac.cpp @@ -2517,7 +2517,8 @@ llvm::Constant *CGObjCCommonMac::getBitmapBlockLayout(bool ComputeByrefLayout) { printf(", BL_WEAK:%d", (int) numWeak); printf(", BL_OPERATOR:0\n"); } - return llvm::ConstantInt::get(CGM.IntPtrTy, Result); + return llvm::ConstantExpr::getIntToPtr( + llvm::ConstantInt::get(CGM.IntPtrTy, Result), CGM.Int8PtrTy); } unsigned char inst = (BLOCK_LAYOUT_OPERATOR << 4) | 0; diff --git a/clang/lib/CodeGen/CGObjCRuntime.h b/clang/lib/CodeGen/CGObjCRuntime.h index 9b0706770aa..28d88dd10be 100644 --- a/clang/lib/CodeGen/CGObjCRuntime.h +++ b/clang/lib/CodeGen/CGObjCRuntime.h @@ -275,8 +275,11 @@ public: const CodeGen::CGBlockInfo &blockInfo) = 0; virtual llvm::Constant *BuildRCBlockLayout(CodeGen::CodeGenModule &CGM, const CodeGen::CGBlockInfo &blockInfo) = 0; + + /// Returns an i8* which points to the byref layout information. virtual llvm::Constant *BuildByrefLayout(CodeGen::CodeGenModule &CGM, QualType T) = 0; + virtual llvm::GlobalVariable *GetClassGlobal(const std::string &Name, bool Weak = false) = 0; |
