diff options
| author | Vedant Kumar <vsk@apple.com> | 2015-12-21 19:30:37 +0000 |
|---|---|---|
| committer | Vedant Kumar <vsk@apple.com> | 2015-12-21 19:30:37 +0000 |
| commit | eb37ec87e48ea58c2a5555faeafc7968be5738bb (patch) | |
| tree | 6e3e2d3115cdd40ea4f79b53ea3f86980c082385 /clang/lib/CodeGen/CGObjCMac.cpp | |
| parent | b2910ea67e4d796cbed535edee114882691aba55 (diff) | |
| download | llvm-eb37ec87e48ea58c2a5555faeafc7968be5738bb.zip llvm-eb37ec87e48ea58c2a5555faeafc7968be5738bb.tar.gz llvm-eb37ec87e48ea58c2a5555faeafc7968be5738bb.tar.bz2 | |
[CodeGen] Fix assignments of inline layouts into the byref structure
When using blocks, a byref structure is created to represent the
closure. The "byref.layout" field of this structure is an i8*. However,
some 'inline' layouts are represented as i64's, not i8*'s.
Prior to r246985 we cast the i64 'inline' layout to an i8* before
assigning it into the byref structure. This patch brings the cast back
and adds a regression test.
rdar://23713871
llvm-svn: 256185
Diffstat (limited to 'clang/lib/CodeGen/CGObjCMac.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGObjCMac.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGObjCMac.cpp b/clang/lib/CodeGen/CGObjCMac.cpp index c29b435..641d157 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; |