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

For C++ copied in objects, use copy constructors in 

setting up block's descriptor. This is on going work to
support c++ specific issues in setting up blocks
various APIs.

llvm-svn: 105469
This commit is contained in:
Fariborz Jahanian 2010-06-04 16:10:00 +00:00
parent 92eb2cbbef
commit 64176c2c97
3 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -364,11 +364,28 @@ llvm::Value *CodeGenFunction::BuildBlockLiteralTmp(const BlockExpr *BE) {
E = new (getContext()) DeclRefExpr(const_cast<ValueDecl*>(VD),
VD->getType().getNonReferenceType(),
SourceLocation());
if (VD->getType()->isReferenceType())
E = new (getContext())
UnaryOperator(const_cast<Expr*>(E), UnaryOperator::AddrOf,
getContext().getPointerType(E->getType()),
SourceLocation());
if (getContext().getLangOptions().CPlusPlus) {
if (VD->getType()->isReferenceType()) {
E = new (getContext())
UnaryOperator(const_cast<Expr*>(E), UnaryOperator::AddrOf,
getContext().getPointerType(E->getType()),
SourceLocation());
}
else {
QualType T = E->getType();
if (const RecordType *RT = T->getAs<RecordType>()) {
CXXRecordDecl *Record = cast<CXXRecordDecl>(RT->getDecl());
if (!Record->hasTrivialCopyConstructor()) {
CXXConstructorDecl *D = Record->getCopyConstructor(getContext(),
0);
Expr *Arg = const_cast<Expr*>(E);
E = CXXConstructExpr::Create(getContext(), T, D->getLocation(),
D, false, &Arg, 1, false,
CXXConstructExpr::CK_Complete);
}
}
}
}
}
}
@ -607,6 +624,10 @@ void CodeGenFunction::AllocateBlockDecl(const BlockDeclRefExpr *E) {
llvm::Value *CodeGenFunction::GetAddrOfBlockDecl(const ValueDecl *VD,
bool IsByRef) {
llvm::Value *&VE = BlockDeclsValue[VD];
if (VE)
return VE;
CharUnits offset = BlockDecls[VD];
assert(!offset.isZero() && "getting address of unallocated decl");
@ -634,12 +655,12 @@ llvm::Value *CodeGenFunction::GetAddrOfBlockDecl(const ValueDecl *VD,
V = Builder.CreateLoad(V);
} else {
const llvm::Type *Ty = CGM.getTypes().ConvertType(VD->getType());
Ty = llvm::PointerType::get(Ty, 0);
V = Builder.CreateBitCast(V, Ty);
if (VD->getType()->isReferenceType())
V = Builder.CreateLoad(V, "tmp");
V = Builder.CreateLoad(V, "ref.tmp");
}
VE = V;
return V;
}

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

@ -180,6 +180,9 @@ public:
/// BlockDecls - Offsets for all Decls in BlockDeclRefExprs.
llvm::DenseMap<const Decl*, CharUnits> BlockDecls;
/// BlockDeclsValue - llvm::Value for all Decls in BlockDeclRefExprs.
llvm::DenseMap<const Decl*, llvm::Value *> BlockDeclsValue;
/// BlockCXXThisOffset - The offset of the C++ 'this' value within
/// the block structure.

18
clang/test/CodeGenCXX/copy-in-cplus-object.cpp Normal file
View File

@ -0,0 +1,18 @@
// RUN: %clang_cc1 %s -fblocks -triple x86_64-apple-darwin -emit-llvm -o - | FileCheck %s
struct TestObject
{
TestObject(const TestObject& inObj);
TestObject();
TestObject& operator=(const TestObject& inObj);
int version() const;
};
void testRoutine() {
TestObject one;
int (^V)() = ^{ return one.version(); };
}
// CHECK: call void @_ZN10TestObjectC1ERKS_