intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-29 21:04:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make BuildByRefType take a ValueDecl instead of a QualType and an alignment.

Browse Source 
llvm-svn: 81315
This commit is contained in:
Anders Carlsson
2009-09-09 02:51:03 +00:00
parent d556bc48d7
commit 71d1d92d37
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -185,8 +185,7 @@ llvm::Value *CodeGenFunction::BuildBlockLiteralTmp(const BlockExpr *BE) {
const BlockDeclRefExpr *BDRE = dyn_cast<BlockDeclRefExpr>(E);
QualType Ty = E->getType();
if (BDRE && BDRE->isByRef()) {
uint64_t Align = getContext().getDeclAlignInBytes(BDRE->getDecl());
Types[i+5] = llvm::PointerType::get(BuildByRefType(Ty, Align), 0);
Types[i+5] = llvm::PointerType::get(BuildByRefType(BDRE->getDecl()), 0);
} else
Types[i+5] = ConvertType(Ty);
}
@@ -464,9 +463,8 @@ llvm::Value *CodeGenFunction::GetAddrOfBlockDecl(const BlockDeclRefExpr *E) {
"block.literal");
if (E->isByRef()) {
bool needsCopyDispose = BlockRequiresCopying(E->getType());
uint64_t Align = getContext().getDeclAlignInBytes(E->getDecl());
const llvm::Type *PtrStructTy
= llvm::PointerType::get(BuildByRefType(E->getType(), Align), 0);
= llvm::PointerType::get(BuildByRefType(E->getDecl()), 0);
// The block literal will need a copy/destroy helper.
BlockHasCopyDispose = true;
Ty = PtrStructTy;

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

@@ -213,8 +213,10 @@ void CodeGenFunction::EmitStaticBlockVarDecl(const VarDecl &D) {
/// } x
///
/// Align is the alignment needed in bytes for x.
const llvm::Type *CodeGenFunction::BuildByRefType(QualType Ty,
uint64_t Align) {
const llvm::Type *CodeGenFunction::BuildByRefType(const ValueDecl *D) {
QualType Ty = D->getType();
uint64_t Align = getContext().getDeclAlignInBytes(D);
const llvm::Type *LTy = ConvertType(Ty);
bool needsCopyDispose = BlockRequiresCopying(Ty);
std::vector<const llvm::Type *> Types(needsCopyDispose*2+5);
@@ -251,7 +253,7 @@ void CodeGenFunction::EmitLocalBlockVarDecl(const VarDecl &D) {
const llvm::Type *LTy = ConvertTypeForMem(Ty);
Align = getContext().getDeclAlignInBytes(&D);
if (isByRef)
LTy = BuildByRefType(Ty, Align);
LTy = BuildByRefType(&D);
llvm::AllocaInst *Alloc = CreateTempAlloca(LTy);
Alloc->setName(D.getNameAsString().c_str());
@@ -326,6 +328,12 @@ void CodeGenFunction::EmitLocalBlockVarDecl(const VarDecl &D) {
if (Target.useGlobalsForAutomaticVariables()) {
DI->EmitGlobalVariable(static_cast<llvm::GlobalVariable *>(DeclPtr), &D);
} else if (isByRef) {
// FIXME: This code is broken and will not emit debug info for the
// variable. The right way to do this would be to tell LLVM that this is a
// byref pointer, and what the offset is. Unfortunately, right now it's
// not possible unless we create a DIType that corresponds to the byref
// struct.
/*
llvm::Value *Loc;
bool needsCopyDispose = BlockRequiresCopying(Ty);
Loc = Builder.CreateStructGEP(DeclPtr, 1, "forwarding");
@@ -333,6 +341,7 @@ void CodeGenFunction::EmitLocalBlockVarDecl(const VarDecl &D) {
Loc = Builder.CreateBitCast(Loc, DeclPtr->getType());
Loc = Builder.CreateStructGEP(Loc, needsCopyDispose*2+4, "x");
DI->EmitDeclareOfAutoVariable(&D, Loc, Builder);
*/
} else
DI->EmitDeclareOfAutoVariable(&D, DeclPtr, Builder);
}

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

@@ -343,8 +343,7 @@ public:
llvm::Value *LoadBlockStruct();
llvm::Value *GetAddrOfBlockDecl(const BlockDeclRefExpr *E);
const llvm::Type *BuildByRefType(QualType Ty, uint64_t Align);
const llvm::Type *BuildByRefType(const ValueDecl *D);
void GenerateCode(const FunctionDecl *FD,
llvm::Function *Fn);