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 | f6a69116df1a959ce374f97fcacbbcbf71dea363 (patch) | |
| tree | 995e52ea5f09dc3edd57a16d420372d921a2f72a /test/CodeGenObjCXX | |
| parent | b8cc716acd20e16ef3a8e66d6c561a4971330c0c (diff) | |
| download | clang-f6a69116df1a959ce374f97fcacbbcbf71dea363.tar.gz | |
[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
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@256185 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/CodeGenObjCXX')
| -rw-r--r-- | test/CodeGenObjCXX/blocks.mm | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/test/CodeGenObjCXX/blocks.mm b/test/CodeGenObjCXX/blocks.mm index fd93437ff6..63a1b33f35 100644 --- a/test/CodeGenObjCXX/blocks.mm +++ b/test/CodeGenObjCXX/blocks.mm @@ -68,3 +68,18 @@ class CaptureThisAndAnotherPointer { takeBlock(^{ useValues(ptr, this); }); } }; + +// rdar://problem/23713871 +// Check that we don't crash when using BLOCK_LAYOUT_STRONG. +#pragma clang assume_nonnull begin +@interface NSUUID @end +#pragma clang assume_nonnull end + +struct Wrapper1 { NSUUID *Ref; }; +struct Wrapper2 { Wrapper1 W1; }; + +@implementation B +- (void) captureStrongRef { + __block Wrapper2 W2; +} +@end |