From 4fc8fb09d0820e33c97a5e00be89ebf4224b6877 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Thu, 2 Dec 2010 04:27:29 +0000 Subject: attempt to fix a buildbot failure, apparently apache fails to build. llvm-svn: 120688 --- clang/lib/CodeGen/CGDecl.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'clang/lib/CodeGen/CGDecl.cpp') diff --git a/clang/lib/CodeGen/CGDecl.cpp b/clang/lib/CodeGen/CGDecl.cpp index a11861c3e7f..3f87f9fbdc7 100644 --- a/clang/lib/CodeGen/CGDecl.cpp +++ b/clang/lib/CodeGen/CGDecl.cpp @@ -291,8 +291,7 @@ void CodeGenFunction::EmitStaticVarDecl(const VarDecl &D, // FIXME: It is really dangerous to store this in the map; if anyone // RAUW's the GV uses of this constant will be invalid. const llvm::Type *LTy = CGM.getTypes().ConvertTypeForMem(D.getType()); - const llvm::Type *LPtrTy = - llvm::PointerType::get(LTy, D.getType().getAddressSpace()); + const llvm::Type *LPtrTy = LTy->getPointerTo(D.getType().getAddressSpace()); DMEntry = llvm::ConstantExpr::getBitCast(GV, LPtrTy); // Emit global variable debug descriptor for static vars. @@ -815,6 +814,8 @@ void CodeGenFunction::EmitAutoVarDecl(const VarDecl &D, getContext().getTypeSizeInChars(Ty).getQuantity()); const llvm::Type *BP = llvm::Type::getInt8PtrTy(VMContext); + if (Loc->getType() != BP) + Loc = Builder.CreateBitCast(Loc, BP, "tmp"); llvm::Value *NotVolatile = Builder.getFalse(); @@ -823,14 +824,14 @@ void CodeGenFunction::EmitAutoVarDecl(const VarDecl &D, if (shouldUseMemSetPlusStoresToInitialize(Init, CGM.getTargetData().getTypeAllocSize(Init->getType()))) { const llvm::Type *BP = llvm::Type::getInt8PtrTy(VMContext); - llvm::Value *MemSetDest = Loc; - if (MemSetDest->getType() != BP) - MemSetDest = Builder.CreateBitCast(MemSetDest, BP, "tmp"); Builder.CreateCall5(CGM.getMemSetFn(BP, SizeVal->getType()), - MemSetDest, Builder.getInt8(0), SizeVal, AlignVal, + Loc, Builder.getInt8(0), SizeVal, AlignVal, NotVolatile); - emitStoresForInitAfterMemset(Init, Loc, Builder); + if (!Init->isNullValue()) { + Loc = Builder.CreateBitCast(Loc, Init->getType()->getPointerTo()); + emitStoresForInitAfterMemset(Init, Loc, Builder); + } } else { // Otherwise, create a temporary global with the initializer then @@ -846,10 +847,6 @@ void CodeGenFunction::EmitAutoVarDecl(const VarDecl &D, if (SrcPtr->getType() != BP) SrcPtr = Builder.CreateBitCast(SrcPtr, BP, "tmp"); - const llvm::Type *BP = llvm::Type::getInt8PtrTy(VMContext); - if (Loc->getType() != BP) - Loc = Builder.CreateBitCast(Loc, BP, "tmp"); - Builder.CreateCall5(CGM.getMemCpyFn(Loc->getType(), SrcPtr->getType(), SizeVal->getType()), Loc, SrcPtr, SizeVal, AlignVal, NotVolatile); -- cgit v1.2.3