[cfe-commits] r95822 - in /cfe/trunk: lib/CodeGen/CGBlocks.cpp test/CodeGenObjC/objc2-weak-block-call.m

[Fariborz Jahanian]

Author: fjahanian
Date: Wed Feb 10 17:34:57 2010
New Revision: 95822

URL: http://llvm.org/viewvc/llvm-project?rev=95822&view=rev
Log:
Generate the objc_read_weak API when calling
a __weak block. Fixes radar 7628591.

Added:
    cfe/trunk/test/CodeGenObjC/objc2-weak-block-call.m
Modified:
    cfe/trunk/lib/CodeGen/CGBlocks.cpp

Modified: cfe/trunk/lib/CodeGen/CGBlocks.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGBlocks.cpp?rev=95822&r1=95821&r2=95822&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CGBlocks.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGBlocks.cpp Wed Feb 10 17:34:57 2010
@@ -13,6 +13,7 @@
 
 #include "CGDebugInfo.h"
 #include "CodeGenFunction.h"
+#include "CGObjCRuntime.h"
 #include "CodeGenModule.h"
 #include "clang/AST/DeclObjC.h"
 #include "llvm/Module.h"
@@ -355,7 +356,21 @@
   }
 
   QualType BPT = BE->getType();
-  return Builder.CreateBitCast(V, ConvertType(BPT));
+  V = Builder.CreateBitCast(V, ConvertType(BPT));
+  // See if this is a __weak block variable and the must call objc_read_weak
+  // on it.
+  const FunctionType *ftype = BPT->getPointeeType()->getAs<FunctionType>();
+  QualType RES = ftype->getResultType();
+  if (RES.isObjCGCWeak()) {
+    // Must cast argument to id*
+    const llvm::Type *ObjectPtrTy = 
+      ConvertType(CGM.getContext().getObjCIdType());
+    const llvm::Type *PtrObjectPtrTy = 
+      llvm::PointerType::getUnqual(ObjectPtrTy);
+    V = Builder.CreateBitCast(V, PtrObjectPtrTy);
+    V =  CGM.getObjCRuntime().EmitObjCWeakRead(*this, V);
+  }
+  return V;
 }
 
 

Added: cfe/trunk/test/CodeGenObjC/objc2-weak-block-call.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/objc2-weak-block-call.m?rev=95822&view=auto

==============================================================================
--- cfe/trunk/test/CodeGenObjC/objc2-weak-block-call.m (added)
+++ cfe/trunk/test/CodeGenObjC/objc2-weak-block-call.m Wed Feb 10 17:34:57 2010
@@ -0,0 +1,29 @@
+// RUN: %clang_cc1 -fblocks -fobjc-gc -triple x86_64-apple-darwin -S %s -o %t-64.s
+// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s
+// RUN: %clang_cc1 -fblocks -fobjc-gc -triple i386-apple-darwin -S %s -o %t-32.s
+// RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s
+
+ at interface MyView
+- (void)MyView_sharedInit;
+ at end
+
+void foo(MyView *(^obj)(void)) ;
+
+ at implementation MyView
+- (void)MyView_sharedInit {
+    
+    __block __weak MyView *weakSelf = self;
+    foo(
+    ^{
+	return weakSelf;
+    });
+
+}
+ at end
+
+// CHECK-LP64: callq    _objc_read_weak
+// CHECK-LP64: callq    _objc_read_weak
+
+// CHECK-LP32: call     L_objc_read_weak
+// CHECK-LP32: call     L_objc_read_weak
+