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

Work around a problem with a static helper's formulation in release 

builds introduced in r134972:

lib/CodeGen/CGExpr.cpp:1294:7: error: no matching function for call to 'EmitBitCastOfLValueToProperType'
lib/CodeGen/CGExpr.cpp:1278:1: note: candidate function not viable: no known conversion from 'CGBuilderTy' (aka 'IRBuilder<false>') to 'llvm::IRBuilder<> &' for 1st argument

This fixes the issue by passing CodeGenFunction on down, and using its
builder directly rather than passing just the builder down.

This may not be the best / cleanest fix, Chris please review. It at
least fixes builds.

llvm-svn: 134977
This commit is contained in:
Chandler Carruth 2011-07-12 08:58:26 +00:00
parent 38198ded24
commit 4678f67139
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clang/lib/CodeGen/CGExpr.cpp
View File

@ -1275,11 +1275,11 @@ static void setObjCGCLValueClass(const ASTContext &Ctx, const Expr *E,
}
static llvm::Value *
EmitBitCastOfLValueToProperType(llvm::IRBuilder<> &Builder,
EmitBitCastOfLValueToProperType(CodeGenFunction &CGF,
llvm::Value *V, llvm::Type *IRType,
llvm::StringRef Name = llvm::StringRef()) {
unsigned AS = cast<llvm::PointerType>(V->getType())->getAddressSpace();
return Builder.CreateBitCast(V, IRType->getPointerTo(AS), Name);
return CGF.Builder.CreateBitCast(V, IRType->getPointerTo(AS), Name);
}
static LValue EmitGlobalVarDeclLValue(CodeGenFunction &CGF,
@ -1291,7 +1291,7 @@ static LValue EmitGlobalVarDeclLValue(CodeGenFunction &CGF,
if (VD->getType()->isReferenceType())
V = CGF.Builder.CreateLoad(V, "tmp");
V = EmitBitCastOfLValueToProperType(CGF.Builder, V,
V = EmitBitCastOfLValueToProperType(CGF, V,
CGF.getTypes().ConvertTypeForMem(E->getType()));
unsigned Alignment = CGF.getContext().getDeclAlign(VD).getQuantity();
@ -1350,7 +1350,7 @@ LValue CodeGenFunction::EmitDeclRefLValue(const DeclRefExpr *E) {
if (VD->getType()->isReferenceType())
V = Builder.CreateLoad(V, "tmp");
V = EmitBitCastOfLValueToProperType(Builder, V,
V = EmitBitCastOfLValueToProperType(*this, V,
getTypes().ConvertTypeForMem(E->getType()));
LValue LV = MakeAddrLValue(V, E->getType(), Alignment);
@ -1850,7 +1850,7 @@ LValue CodeGenFunction::EmitLValueForField(llvm::Value *baseAddr,
// for both unions and structs. A union needs a bitcast, a struct element
// will need a bitcast if the LLVM type laid out doesn't match the desired
// type.
addr = EmitBitCastOfLValueToProperType(Builder, addr,
addr = EmitBitCastOfLValueToProperType(*this, addr,
CGM.getTypes().ConvertTypeForMem(type),
field->getName());