diff options
| -rw-r--r-- | clang/lib/CodeGen/CGBlocks.cpp | 23 | ||||
| -rw-r--r-- | clang/lib/CodeGen/CGBlocks.h | 3 | ||||
| -rw-r--r-- | clang/test/CodeGenObjC/objc2-weak-block-call.m | 13 |
3 files changed, 5 insertions, 34 deletions
diff --git a/clang/lib/CodeGen/CGBlocks.cpp b/clang/lib/CodeGen/CGBlocks.cpp index fb90e025eb7..a35648d23d5 100644 --- a/clang/lib/CodeGen/CGBlocks.cpp +++ b/clang/lib/CodeGen/CGBlocks.cpp @@ -27,8 +27,7 @@ using namespace CodeGen; CGBlockInfo::CGBlockInfo(const BlockExpr *blockExpr, const char *N) : Name(N), CXXThisIndex(0), CanBeGlobal(false), NeedsCopyDispose(false), - HasCXXObject(false), HasWeakBlockVariable(false), - StructureType(0), Block(blockExpr) { + HasCXXObject(false), StructureType(0), Block(blockExpr) { // Skip asm prefix, if any. if (Name && Name[0] == '\01') @@ -355,10 +354,6 @@ static void computeBlockInfo(CodeGenModule &CGM, CGBlockInfo &info) { // We have to copy/dispose of the __block reference. info.NeedsCopyDispose = true; - // Also note that it's weak for GC purposes. - if (variable->getType().isObjCGCWeak()) - info.HasWeakBlockVariable = true; - // Just use void* instead of a pointer to the byref type. QualType byRefPtrTy = C.VoidPtrTy; @@ -650,22 +645,6 @@ llvm::Value *CodeGenFunction::EmitBlockLiteral(const BlockExpr *blockExpr) { Builder.CreateBitCast(blockAddr, ConvertType(blockInfo.getBlockExpr()->getType())); - // We must call objc_read_weak on the block literal itself if it closes - // on any __weak __block variables. For some reason. - if (blockInfo.HasWeakBlockVariable) { - const llvm::Type *OrigTy = result->getType(); - - // Must cast argument to id* - const llvm::Type *ObjectPtrTy = - ConvertType(CGM.getContext().getObjCIdType()); - const llvm::Type *PtrObjectPtrTy = - llvm::PointerType::getUnqual(ObjectPtrTy); - result = Builder.CreateBitCast(result, PtrObjectPtrTy); - result = CGM.getObjCRuntime().EmitObjCWeakRead(*this, result); - - // Cast back to the original type. - result = Builder.CreateBitCast(result, OrigTy); - } return result; } diff --git a/clang/lib/CodeGen/CGBlocks.h b/clang/lib/CodeGen/CGBlocks.h index a2a1cdfdf6a..bee729dccee 100644 --- a/clang/lib/CodeGen/CGBlocks.h +++ b/clang/lib/CodeGen/CGBlocks.h @@ -173,9 +173,6 @@ public: /// need to be run even in GC mode. bool HasCXXObject : 1; - /// HasWeakBlockVariable - True if block captures a weak __block variable. - bool HasWeakBlockVariable : 1; - const llvm::StructType *StructureType; const BlockExpr *Block; CharUnits BlockSize; diff --git a/clang/test/CodeGenObjC/objc2-weak-block-call.m b/clang/test/CodeGenObjC/objc2-weak-block-call.m index 4f7b554f454..8cd233e286b 100644 --- a/clang/test/CodeGenObjC/objc2-weak-block-call.m +++ b/clang/test/CodeGenObjC/objc2-weak-block-call.m @@ -1,7 +1,5 @@ -// 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 +// RUN: %clang_cc1 -fblocks -fobjc-gc -triple x86_64-apple-darwin -emit-llvm %s -o - | FileCheck -check-prefix LP64 %s +// RUN: %clang_cc1 -fblocks -fobjc-gc -triple i386-apple-darwin -emit-llvm %s -o - | FileCheck -check-prefix LP64 %s @interface MyView - (void)MyView_sharedInit; @@ -21,9 +19,6 @@ void foo(MyView *(^obj)(void)) ; } @end -// CHECK-LP64: callq _objc_read_weak -// CHECK-LP64: callq _objc_read_weak - -// CHECK-LP32: calll L_objc_read_weak -// CHECK-LP32: calll L_objc_read_weak +// CHECK-LP64: call i8* @objc_read_weak +// CHECK-LP32: call i8* @objc_read_weak |
