diff options
author | John McCall <rjmccall@apple.com> | 2011-09-10 01:16:55 +0000 |
---|---|---|
committer | John McCall <rjmccall@apple.com> | 2011-09-10 01:16:55 +0000 |
commit | dc05b11c67331016473fbc7909827b1b89c9616b (patch) | |
tree | 65c8e307e0ccdcb67ebba0c530f476d59f87c09f /lib/CodeGen/CGExpr.cpp | |
parent | b3321093f6ead084427eb4a6621832fc4ee2f5de (diff) |
When converting a block pointer to an Objective-C pointer type, extend
the lifetime of the block by copying it to the heap, or else we'll get
a dangling reference because the code working with the non-block-typed
object will not know it needs to copy.
There is some danger here, e.g. with assigning a block literal to an
unsafe variable, but, well, it's an unsafe variable.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@139451 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGExpr.cpp')
-rw-r--r-- | lib/CodeGen/CGExpr.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp index 7ae95331ad..520b1bbfb8 100644 --- a/lib/CodeGen/CGExpr.cpp +++ b/lib/CodeGen/CGExpr.cpp @@ -2061,7 +2061,8 @@ LValue CodeGenFunction::EmitCastLValue(const CastExpr *E) { case CK_AnyPointerToBlockPointerCast: case CK_ObjCProduceObject: case CK_ObjCConsumeObject: - case CK_ObjCReclaimReturnedObject: { + case CK_ObjCReclaimReturnedObject: + case CK_ObjCExtendBlockObject: { // These casts only produce lvalues when we're binding a reference to a // temporary realized from a (converted) pure rvalue. Emit the expression // as a value, copy it into a temporary, and return an lvalue referring to |