From a98742c32c159a8c76f842947c02a79c530a1d4b Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Tue, 12 Jul 2011 08:58:26 +0000 Subject: [PATCH] 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') 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. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@134977 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGExpr.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp index 6055fa759b..dd238c1715 100644 --- a/lib/CodeGen/CGExpr.cpp +++ b/lib/CodeGen/CGExpr.cpp @@ -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(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()); -- 2.40.0