From: Mike Stump Date: Sat, 7 Mar 2009 02:53:18 +0000 (+0000) Subject: codegen support for dispose helpers for block literals. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1edf6b646ea161ce1193ba278ae88de82ff7114d;p=clang codegen support for dispose helpers for block literals. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@66320 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/CGBlocks.cpp b/lib/CodeGen/CGBlocks.cpp index 8020a8b26f..344ac60d98 100644 --- a/lib/CodeGen/CGBlocks.cpp +++ b/lib/CodeGen/CGBlocks.cpp @@ -802,7 +802,29 @@ GenerateDestroyHelperFunction(bool BlockHasCopyDispose, FunctionDecl::Static, false, true); CGF.StartFunction(FD, R, Fn, Args, SourceLocation()); - // EmitStmt(BExpr->getBody()); + + llvm::Value *SrcObj = CGF.GetAddrOfLocalVar(Src); + llvm::Type *PtrPtrT; + PtrPtrT = llvm::PointerType::get(llvm::PointerType::get(T, 0), 0); + SrcObj = Builder.CreateBitCast(SrcObj, PtrPtrT); + SrcObj = Builder.CreateLoad(SrcObj); + + for (unsigned i=0; i < NoteForHelper.size(); ++i) { + int flag = NoteForHelper[i].flag; + int index = NoteForHelper[i].index; + + if ((NoteForHelper[i].flag & BLOCK_FIELD_IS_BYREF) + || NoteForHelper[i].RequiresCopying) { + llvm::Value *Srcv = SrcObj; + Srcv = Builder.CreateStructGEP(Srcv, index); + Srcv = Builder.CreateBitCast(Srcv, + llvm::PointerType::get(PtrToInt8Ty, 0)); + Srcv = Builder.CreateLoad(Srcv); + + BuildBlockRelease(Srcv, flag); + } + } + CGF.FinishFunction(); return llvm::ConstantExpr::getBitCast(Fn, PtrToInt8Ty); diff --git a/test/CodeGen/blocks-1.c b/test/CodeGen/blocks-1.c index 8b5de629e8..df2a3fda6b 100644 --- a/test/CodeGen/blocks-1.c +++ b/test/CodeGen/blocks-1.c @@ -1,5 +1,5 @@ // RUN: clang %s -emit-llvm -o %t -fblocks -f__block && -// RUN: grep "_Block_object_dispose" %t | count 6 && +// RUN: grep "_Block_object_dispose" %t | count 10 && // RUN: grep "__copy_helper_block_" %t | count 6 && // RUN: grep "__destroy_helper_block_" %t | count 6 && // RUN: grep "__Block_byref_id_object_copy_" %t | count 2 &&