Update llvm-gcc for IRBuilder template argument changes. By
default nothing should change.
llvm-svn: 54547
diff --git a/llvm-gcc-4.2/gcc/config/i386/llvm-i386-target.h b/llvm-gcc-4.2/gcc/config/i386/llvm-i386-target.h
index b8b6599..3616255 100644
--- a/llvm-gcc-4.2/gcc/config/i386/llvm-i386-target.h
+++ b/llvm-gcc-4.2/gcc/config/i386/llvm-i386-target.h
@@ -131,7 +131,7 @@
extern void llvm_x86_extract_multiple_return_value(Value *Src, Value *Dest,
bool isVolatile,
- IRBuilder &B);
+ IRBuilder<> &B);
/* LLVM_EXTRACT_MULTIPLE_RETURN_VALUE - Extract multiple return value from
SRC and assign it to DEST. */
@@ -208,7 +208,7 @@
extern void llvm_x86_store_scalar_argument(Value *Loc, Value *ArgVal,
const llvm::Type *LLVMTy,
unsigned RealSize,
- IRBuilder &Builder);
+ IRBuilder<> &Builder);
#define LLVM_STORE_SCALAR_ARGUMENT(LOC,ARG,TYPE,SIZE,BUILDER) \
llvm_x86_store_scalar_argument((LOC),(ARG),(TYPE),(SIZE),(BUILDER))
@@ -217,7 +217,7 @@
extern Value *llvm_x86_load_scalar_argument(Value *L,
const llvm::Type *LLVMTy,
unsigned RealSize,
- IRBuilder &Builder);
+ IRBuilder<> &Builder);
#define LLVM_LOAD_SCALAR_ARGUMENT(LOC,TY,SIZE,BUILDER) \
llvm_x86_load_scalar_argument((LOC),(TY),(SIZE),(BUILDER))
diff --git a/llvm-gcc-4.2/gcc/config/i386/llvm-i386.cpp b/llvm-gcc-4.2/gcc/config/i386/llvm-i386.cpp
index 8535b72..6106293 100644
--- a/llvm-gcc-4.2/gcc/config/i386/llvm-i386.cpp
+++ b/llvm-gcc-4.2/gcc/config/i386/llvm-i386.cpp
@@ -1231,7 +1231,7 @@
unsigned SrcElemNo,
unsigned DestFieldNo,
unsigned DestElemNo,
- IRBuilder &Builder,
+ IRBuilder<> &Builder,
bool isVolatile) {
Value *EVI = Builder.CreateExtractValue(Src, SrcFieldNo, "mrv_gr");
const StructType *STy = cast<StructType>(Src->getType());
@@ -1254,7 +1254,7 @@
// DEST types are StructType, but they may not match.
void llvm_x86_extract_multiple_return_value(Value *Src, Value *Dest,
bool isVolatile,
- IRBuilder &Builder) {
+ IRBuilder<> &Builder) {
const StructType *STy = cast<StructType>(Src->getType());
unsigned NumElements = STy->getNumElements();
@@ -1358,7 +1358,7 @@
void llvm_x86_store_scalar_argument(Value *Loc, Value *ArgVal,
const llvm::Type *LLVMTy,
unsigned RealSize,
- IRBuilder &Builder) {
+ IRBuilder<> &Builder) {
if (RealSize) {
// Do byte wise store because actaul argument type does not match LLVMTy.
Loc = Builder.CreateBitCast(Loc,
@@ -1382,7 +1382,7 @@
Value *llvm_x86_load_scalar_argument(Value *L,
const llvm::Type *LLVMTy,
unsigned RealSize,
- IRBuilder &Builder) {
+ IRBuilder<> &Builder) {
Value *Loc = NULL;
L = Builder.CreateBitCast(L, PointerType::getUnqual(llvm::Type::Int8Ty), "bc");
// Load each byte individually.
diff --git a/llvm-gcc-4.2/gcc/config/rs6000/llvm-rs6000.cpp b/llvm-gcc-4.2/gcc/config/rs6000/llvm-rs6000.cpp
index fd264d5..86b1841 100644
--- a/llvm-gcc-4.2/gcc/config/rs6000/llvm-rs6000.cpp
+++ b/llvm-gcc-4.2/gcc/config/rs6000/llvm-rs6000.cpp
@@ -44,7 +44,7 @@
unsigned OpNum, Intrinsic::ID IID,
const Type *ResultType,
std::vector<Value*> &Ops,
- IRBuilder &Builder, Value *&Result) {
+ IRBuilder<> &Builder, Value *&Result) {
const Type *VoidPtrTy = PointerType::getUnqual(Type::Int8Ty);
Function *IntFn = Intrinsic::getDeclaration(TheModule, IID);
diff --git a/llvm-gcc-4.2/gcc/llvm-abi.h b/llvm-gcc-4.2/gcc/llvm-abi.h
index 9a1514c..5e71e04 100644
--- a/llvm-gcc-4.2/gcc/llvm-abi.h
+++ b/llvm-gcc-4.2/gcc/llvm-abi.h
@@ -339,7 +339,7 @@
#endif
static void llvm_default_extract_multiple_return_value(Value *Src, Value *Dest,
bool isVolatile,
- IRBuilder &Builder) {
+ IRBuilder<> &Builder) {
assert (0 && "LLVM_EXTRACT_MULTIPLE_RETURN_VALUE is not implemented!");
}
diff --git a/llvm-gcc-4.2/gcc/llvm-convert.cpp b/llvm-gcc-4.2/gcc/llvm-convert.cpp
index beef23b..4b12f20 100644
--- a/llvm-gcc-4.2/gcc/llvm-convert.cpp
+++ b/llvm-gcc-4.2/gcc/llvm-convert.cpp
@@ -395,7 +395,7 @@
static void llvm_store_scalar_argument(Value *Loc, Value *ArgVal,
const llvm::Type *LLVMTy,
unsigned RealSize,
- IRBuilder &Builder) {
+ IRBuilder<> &Builder) {
assert (RealSize == 0 &&
"The target should handle this argument!");
// This cast only involves pointers, therefore BitCast.
@@ -416,13 +416,13 @@
struct FunctionPrologArgumentConversion : public DefaultABIClient {
tree FunctionDecl;
Function::arg_iterator &AI;
- IRBuilder Builder;
+ IRBuilder<> Builder;
std::vector<Value*> LocStack;
std::vector<std::string> NameStack;
unsigned Offset;
FunctionPrologArgumentConversion(tree FnDecl,
Function::arg_iterator &ai,
- const IRBuilder &B)
+ const IRBuilder<> &B)
: FunctionDecl(FnDecl), AI(ai), Builder(B), Offset(0) {}
void setName(const std::string &Name) {
@@ -1296,7 +1296,7 @@
/// CopyAggregate - Recursively traverse the potientially aggregate src/dest
/// ptrs, copying all of the elements.
static void CopyAggregate(MemRef DestLoc, MemRef SrcLoc,
- IRBuilder &Builder, tree gccType) {
+ IRBuilder<> &Builder, tree gccType) {
assert(DestLoc.Ptr->getType() == SrcLoc.Ptr->getType() &&
"Cannot copy between two pointers of different type!");
const Type *ElTy =
@@ -1386,7 +1386,7 @@
/// ZeroAggregate - Recursively traverse the potentially aggregate DestLoc,
/// zero'ing all of the elements.
-static void ZeroAggregate(MemRef DestLoc, IRBuilder &Builder) {
+static void ZeroAggregate(MemRef DestLoc, IRBuilder<> &Builder) {
const Type *ElTy =
cast<PointerType>(DestLoc.Ptr->getType())->getElementType();
if (ElTy->isSingleValueType()) {
@@ -2355,7 +2355,7 @@
static Value *llvm_load_scalar_argument(Value *L,
const llvm::Type *LLVMTy,
unsigned RealSize,
- IRBuilder &Builder) {
+ IRBuilder<> &Builder) {
assert (0 && "The target should override this routine!");
return NULL;
}
@@ -2375,7 +2375,7 @@
const FunctionType *FTy;
const MemRef *DestLoc;
bool useReturnSlot;
- IRBuilder &Builder;
+ IRBuilder<> &Builder;
Value *TheValue;
MemRef RetBuf;
bool isShadowRet;
@@ -2386,7 +2386,7 @@
const FunctionType *FnTy,
const MemRef *destloc,
bool ReturnSlotOpt,
- IRBuilder &b)
+ IRBuilder<> &b)
: CallOperands(ops), FTy(FnTy), DestLoc(destloc),
useReturnSlot(ReturnSlotOpt), Builder(b), isShadowRet(false),
isAggrRet(false), Offset(0) { }
diff --git a/llvm-gcc-4.2/gcc/llvm-internal.h b/llvm-gcc-4.2/gcc/llvm-internal.h
index 2795552..a724d06 100644
--- a/llvm-gcc-4.2/gcc/llvm-internal.h
+++ b/llvm-gcc-4.2/gcc/llvm-internal.h
@@ -281,7 +281,7 @@
/// Builder - Instruction creator, the location to insert into is always the
/// same as &Fn->back().
- IRBuilder Builder;
+ IRBuilder<> Builder;
// AllocaInsertionPoint - Place to insert alloca instructions. Lazily created
// and managed by CreateTemporary.
