maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Finish off __Block_byref_id_object_dispose codegen for block literals. 

llvm-svn: 66247
This commit is contained in:
Mike Stump 2009-03-06 04:53:30 +00:00
parent d4a96730c1
commit fbe25dd1e4
4 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
clang/lib/CodeGen/CGBlocks.cpp
View File

@ -793,7 +793,9 @@ llvm::Constant *BlockFunction::GeneratebyrefCopyHelperFunction() {
return llvm::ConstantExpr::getBitCast(Fn, PtrToInt8Ty); return llvm::ConstantExpr::getBitCast(Fn, PtrToInt8Ty);
} }
llvm::Constant *BlockFunction::GeneratebyrefDestroyHelperFunction() { llvm::Constant *
BlockFunction::GeneratebyrefDestroyHelperFunction(const llvm::Type *T,
int flag) {
QualType R = getContext().VoidTy; QualType R = getContext().VoidTy;
FunctionArgList Args; FunctionArgList Args;
@ -825,7 +827,19 @@ llvm::Constant *BlockFunction::GeneratebyrefDestroyHelperFunction() {
FunctionDecl::Static, false, FunctionDecl::Static, false,
true); true);
CGF.StartFunction(FD, R, Fn, Args, SourceLocation()); CGF.StartFunction(FD, R, Fn, Args, SourceLocation());
// BuildBlockRelease(Src, flag);
llvm::Value *V = CGF.GetAddrOfLocalVar(Src);
V = Builder.CreateBitCast(V, T);
V = Builder.CreateStructGEP(V, 6, "x");
V = Builder.CreateBitCast(V, PtrToInt8Ty);
// FIXME: Move to other one.
// int flag = BLOCK_FIELD_IS_BYREF;
// FIXME: Add weak support
if (0)
flag |= BLOCK_FIELD_IS_WEAK;
flag |= BLOCK_BYREF_CALLER;
BuildBlockRelease(V, flag);
CGF.FinishFunction(); CGF.FinishFunction();
return llvm::ConstantExpr::getBitCast(Fn, PtrToInt8Ty); return llvm::ConstantExpr::getBitCast(Fn, PtrToInt8Ty);
@ -835,8 +849,9 @@ llvm::Constant *BlockFunction::BuildbyrefCopyHelper(int flag) {
return CodeGenFunction(CGM).GeneratebyrefCopyHelperFunction(); return CodeGenFunction(CGM).GeneratebyrefCopyHelperFunction();
} }
llvm::Constant *BlockFunction::BuildbyrefDestroyHelper(int flag) { llvm::Constant *BlockFunction::BuildbyrefDestroyHelper(const llvm::Type *T,
return CodeGenFunction(CGM).GeneratebyrefDestroyHelperFunction(); int flag) {
return CodeGenFunction(CGM).GeneratebyrefDestroyHelperFunction(T, flag);
} }
llvm::Value *BlockFunction::getBlockObjectDispose() { llvm::Value *BlockFunction::getBlockObjectDispose() {
@ -853,13 +868,11 @@ llvm::Value *BlockFunction::getBlockObjectDispose() {
return CGM.BlockObjectDispose; return CGM.BlockObjectDispose;
} }
void BlockFunction::BuildBlockRelease(llvm::Value *DeclPtr) { void BlockFunction::BuildBlockRelease(llvm::Value *V, int flag) {
llvm::Value *F = getBlockObjectDispose(); llvm::Value *F = getBlockObjectDispose();
llvm::Value *N, *V; llvm::Value *N;
V = Builder.CreateStructGEP(DeclPtr, 1, "forwarding");
V = Builder.CreateLoad(V, false);
V = Builder.CreateBitCast(V, PtrToInt8Ty); V = Builder.CreateBitCast(V, PtrToInt8Ty);
N = llvm::ConstantInt::get(llvm::Type::Int32Ty, BLOCK_FIELD_IS_BYREF); N = llvm::ConstantInt::get(llvm::Type::Int32Ty, flag);
Builder.CreateCall2(F, V, N); Builder.CreateCall2(F, V, N);
} }

6
clang/lib/CodeGen/CGBlocks.h
View File

@ -164,13 +164,13 @@ public:
llvm::Constant *BuildDestroyHelper(); llvm::Constant *BuildDestroyHelper();
llvm::Constant *GeneratebyrefCopyHelperFunction(); llvm::Constant *GeneratebyrefCopyHelperFunction();
llvm::Constant *GeneratebyrefDestroyHelperFunction(); llvm::Constant *GeneratebyrefDestroyHelperFunction(const llvm::Type *T, int);
llvm::Constant *BuildbyrefCopyHelper(int flag); llvm::Constant *BuildbyrefCopyHelper(int flag);
llvm::Constant *BuildbyrefDestroyHelper(int flag); llvm::Constant *BuildbyrefDestroyHelper(const llvm::Type*, int flag);
llvm::Value *getBlockObjectDispose(); llvm::Value *getBlockObjectDispose();
void BuildBlockRelease(llvm::Value *DeclPtr); void BuildBlockRelease(llvm::Value *DeclPtr, int flag = BLOCK_FIELD_IS_BYREF);
bool BlockRequiresCopying(QualType Ty) { bool BlockRequiresCopying(QualType Ty) {
if (Ty->isBlockPointerType()) if (Ty->isBlockPointerType())

12
clang/lib/CodeGen/CGDecl.cpp
View File

@ -345,8 +345,8 @@ void CodeGenFunction::EmitLocalBlockVarDecl(const VarDecl &D) {
flag |= BLOCK_FIELD_IS_BLOCK; flag |= BLOCK_FIELD_IS_BLOCK;
flags |= BLOCK_HAS_COPY_DISPOSE; flags |= BLOCK_HAS_COPY_DISPOSE;
} else if (BlockRequiresCopying(Ty)) { } else if (BlockRequiresCopying(Ty)) {
flags |= BLOCK_HAS_COPY_DISPOSE;
flag |= BLOCK_FIELD_IS_OBJECT; flag |= BLOCK_FIELD_IS_OBJECT;
flags |= BLOCK_HAS_COPY_DISPOSE;
} }
// FIXME: Need to set BLOCK_FIELD_IS_WEAK as appropriate. // FIXME: Need to set BLOCK_FIELD_IS_WEAK as appropriate.
@ -373,11 +373,11 @@ void CodeGenFunction::EmitLocalBlockVarDecl(const VarDecl &D) {
if (flags & BLOCK_HAS_COPY_DISPOSE) { if (flags & BLOCK_HAS_COPY_DISPOSE) {
BlockHasCopyDispose = true; BlockHasCopyDispose = true;
llvm::Value *copy_helper = Builder.CreateStructGEP(DeclPtr, 4); llvm::Value *copy_helper = Builder.CreateStructGEP(DeclPtr, 4);
llvm::Value *destroy_helper = Builder.CreateStructGEP(DeclPtr, 5);
Builder.CreateStore(BuildbyrefCopyHelper(flag), copy_helper); Builder.CreateStore(BuildbyrefCopyHelper(flag), copy_helper);
Builder.CreateStore(BuildbyrefDestroyHelper(flag), destroy_helper); llvm::Value *destroy_helper = Builder.CreateStructGEP(DeclPtr, 5);
Builder.CreateStore(BuildbyrefDestroyHelper(DeclPtr->getType(), flag),
destroy_helper);
} }
needsDispose = true; needsDispose = true;
} }
@ -400,7 +400,9 @@ void CodeGenFunction::EmitLocalBlockVarDecl(const VarDecl &D) {
if (needsDispose && CGM.getLangOptions().getGCMode() != LangOptions::GCOnly) { if (needsDispose && CGM.getLangOptions().getGCMode() != LangOptions::GCOnly) {
CleanupScope scope(*this); CleanupScope scope(*this);
BuildBlockRelease(DeclPtr); llvm::Value *V = Builder.CreateStructGEP(DeclPtr, 1, "forwarding");
V = Builder.CreateLoad(V, false);
BuildBlockRelease(V);
} }
} }

11
clang/test/CodeGen/blocks-1.c
View File

@ -1,9 +1,10 @@
// RUN: clang %s -emit-llvm -o %t -fblocks -f__block && // RUN: clang %s -emit-llvm -o %t -fblocks -f__block &&
// RUN: grep "_Block_object_dispose" %t | count 5 // RUN: grep "_Block_object_dispose" %t | count 5 &&
// RUN: grep "__copy_helper_block_" %t | count 6 // RUN: grep "__copy_helper_block_" %t | count 6 &&
// RUN: grep "__destroy_helper_block_" %t | count 6 // RUN: grep "__destroy_helper_block_" %t | count 6 &&
// RUN: grep "__Block_byref_id_object_copy_" %t | count 2 // RUN: grep "__Block_byref_id_object_copy_" %t | count 2 &&
// RUN: grep "__Block_byref_id_object_dispose_" %t | count 2 // RUN: grep "__Block_byref_id_object_dispose_" %t | count 2 &&
// RUN: grep "i32 135)" %t | count 1
#include <stdio.h> #include <stdio.h>
void test1() { void test1() {