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

1 files changed, 3 insertions, 0 deletions

diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp
index 25e7de77fb..63642b216f 100644
--- a/lib/AST/Expr.cpp
+++ b/lib/AST/Expr.cpp
@@ -1079,6 +1079,7 @@ void CastExpr::CheckCastConsistency() const {
   case CK_ObjCProduceObject:
   case CK_ObjCConsumeObject:
   case CK_ObjCReclaimReturnedObject:
+  case CK_ObjCExtendBlockObject:
     assert(!getType()->isBooleanType() && "unheralded conversion to bool");
     goto CheckNoBasePath;
 
@@ -1198,6 +1199,8 @@ const char *CastExpr::getCastKindName() const {
     return "ObjCProduceObject";
   case CK_ObjCReclaimReturnedObject:
     return "ObjCReclaimReturnedObject";
+  case CK_ObjCExtendBlockObject:
+    return "ObjCExtendBlockObject";
   }
 
   llvm_unreachable("Unhandled cast kind!");