[llvm-commits] [llvm-gcc-4.2] r135265 - in /llvm-gcc-4.2/trunk/gcc: config/arm/llvm-arm.cpp config/i386/llvm-i386.cpp config/rs6000/llvm-rs6000.cpp llvm-convert.cpp llvm-debug.cpp
Jay Foad
jay.foad at gmail.com
Fri Jul 15 01:37:36 PDT 2011
Author: foad
Date: Fri Jul 15 03:37:34 2011
New Revision: 135265
URL: http://llvm.org/viewvc/llvm-project?rev=135265&view=rev
Log:
Convert CallInst and InvokeInst APIs to use ArrayRef.
Modified:
llvm-gcc-4.2/trunk/gcc/config/arm/llvm-arm.cpp
llvm-gcc-4.2/trunk/gcc/config/i386/llvm-i386.cpp
llvm-gcc-4.2/trunk/gcc/config/rs6000/llvm-rs6000.cpp
llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp
Modified: llvm-gcc-4.2/trunk/gcc/config/arm/llvm-arm.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/arm/llvm-arm.cpp?rev=135265&r1=135264&r2=135265&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/arm/llvm-arm.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/config/arm/llvm-arm.cpp Fri Jul 15 03:37:34 2011
@@ -1907,7 +1907,7 @@
}
}
Args.push_back(Ops[1]);
- Result = Builder.CreateCall(intFn, Args.begin(), Args.end());
+ Result = Builder.CreateCall(intFn, Args);
break;
}
@@ -1947,7 +1947,7 @@
}
}
Args.push_back(Ops[2]);
- Result = Builder.CreateCall(intFn, Args.begin(), Args.end());
+ Result = Builder.CreateCall(intFn, Args);
break;
}
@@ -2092,7 +2092,7 @@
Args.push_back(Ops[2]); // lane number
unsigned Align = getPointerAlignment(TREE_VALUE(TREE_OPERAND(exp, 1)));
Args.push_back(getInt32Const(Align));
- Result = Builder.CreateCall(intFn, Args.begin(), Args.end());
+ Result = Builder.CreateCall(intFn, Args);
Builder.CreateStore(Result, DestLoc->Ptr);
Result = 0;
break;
@@ -2153,7 +2153,7 @@
Args.push_back(getInt32Const(0));
unsigned Align = getPointerAlignment(TREE_VALUE(TREE_OPERAND(exp, 1)));
Args.push_back(getInt32Const(Align));
- Result = Builder.CreateCall(intFn, Args.begin(), Args.end());
+ Result = Builder.CreateCall(intFn, Args);
// Now splat the values in lane 0 to the rest of the elements.
for (unsigned n = 0; n != NumVecs; ++n) {
@@ -2207,7 +2207,7 @@
}
unsigned Align = getPointerAlignment(TREE_VALUE(TREE_OPERAND(exp, 1)));
Args.push_back(getInt32Const(Align));
- Builder.CreateCall(intFn, Args.begin(), Args.end());
+ Builder.CreateCall(intFn, Args);
Result = 0;
break;
}
@@ -2254,7 +2254,7 @@
Args.push_back(Ops[2]); // lane number
unsigned Align = getPointerAlignment(TREE_VALUE(TREE_OPERAND(exp, 1)));
Args.push_back(getInt32Const(Align));
- Builder.CreateCall(intFn, Args.begin(), Args.end());
+ Builder.CreateCall(intFn, Args);
Result = 0;
break;
}
Modified: llvm-gcc-4.2/trunk/gcc/config/i386/llvm-i386.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/llvm-i386.cpp?rev=135265&r1=135264&r2=135265&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/llvm-i386.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/llvm-i386.cpp Fri Jul 15 03:37:34 2011
@@ -81,7 +81,7 @@
for (unsigned I = 2; I < NumOps && I < 10; ++I)
CallOps[I] = Ops[I];
- Result = Builder.CreateCall(Func, CallOps, CallOps + NumOps);
+ Result = Builder.CreateCall(Func, ArrayRef<Value *>(CallOps, NumOps));
if (EncodePattern & Encode::Return)
Result = Builder.CreateBitCast(Result, MMXTy);
@@ -442,7 +442,7 @@
Value *Arg1 = ConvertToX86_MMXTy(Ops[1], Builder);
Value *CallOps[2] = { Arg0, Arg1 };
- Result = Builder.CreateCall(Func, CallOps, CallOps + 2);
+ Result = Builder.CreateCall(Func, CallOps);
return true;
}
case IX86_BUILTIN_MOVNTPS:
@@ -470,7 +470,7 @@
"i32_to_i8");
Value *CallOps[3] = { Arg0, Arg1, Arg2 };
- Result = Builder.CreateCall(Func, CallOps, CallOps + 3);
+ Result = Builder.CreateCall(Func, CallOps);
Result = Builder.CreateBitCast(Result, MMXTy);
return true;
}
@@ -892,7 +892,7 @@
Value *Arg1 = Ops[1];
if (flip) std::swap(Arg0, Arg1);
Value *CallOps[3] = { Arg0, Arg1, Pred };
- Result = Builder.CreateCall(cmpps, CallOps, CallOps+3);
+ Result = Builder.CreateCall(cmpps, CallOps);
Result = Builder.CreateBitCast(Result, ResultType);
return true;
}
@@ -922,7 +922,7 @@
}
Value *Pred = ConstantInt::get(Type::getInt8Ty(Context), PredCode);
Value *CallOps[3] = { Ops[0], Ops[1], Pred };
- Result = Builder.CreateCall(cmpss, CallOps, CallOps+3);
+ Result = Builder.CreateCall(cmpss, CallOps);
Result = Builder.CreateBitCast(Result, ResultType);
return true;
}
@@ -963,7 +963,7 @@
if (flip) std::swap(Arg0, Arg1);
Value *CallOps[3] = { Arg0, Arg1, Pred };
- Result = Builder.CreateCall(cmppd, CallOps, CallOps+3);
+ Result = Builder.CreateCall(cmppd, CallOps);
Result = Builder.CreateBitCast(Result, ResultType);
return true;
}
@@ -991,7 +991,7 @@
}
Value *Pred = ConstantInt::get(Type::getInt8Ty(Context), PredCode);
Value *CallOps[3] = { Ops[0], Ops[1], Pred };
- Result = Builder.CreateCall(cmpsd, CallOps, CallOps+3);
+ Result = Builder.CreateCall(cmpsd, CallOps);
Result = Builder.CreateBitCast(Result, ResultType);
return true;
}
@@ -1052,7 +1052,8 @@
// create i32 constant
llvm::Function *F = Intrinsic::getDeclaration(TheModule,
Intrinsic::x86_sse2_psrl_dq);
- Result = Builder.CreateCall(F, &Ops[0], &Ops[0] + 2, "palignr");
+ Result = Builder.CreateCall(F, ArrayRef<Value *>(&Ops[0], 2),
+ "palignr");
return true;
}
Modified: llvm-gcc-4.2/trunk/gcc/config/rs6000/llvm-rs6000.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/rs6000/llvm-rs6000.cpp?rev=135265&r1=135264&r2=135265&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/rs6000/llvm-rs6000.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/config/rs6000/llvm-rs6000.cpp Fri Jul 15 03:37:34 2011
@@ -69,7 +69,7 @@
Ops.erase(Ops.begin() + OpNum);
Ops[OpNum] = Ptr;
- Value *V = Builder.CreateCall(IntFn, &Ops[0], &Ops[0]+Ops.size());
+ Value *V = Builder.CreateCall(IntFn, Ops);
if (V->getType() != Type::getVoidTy(Context)) {
V->setName("tmp");
@@ -324,7 +324,7 @@
unsigned N = GetAltivecTypeNumFromType(PTy->getElementType());
Function *smax = Intrinsic::getDeclaration(TheModule, smax_iid[N]);
Value *ActualOps[] = { Ops[0], Result };
- Result = Builder.CreateCall(smax, ActualOps, ActualOps+2, "tmp");
+ Result = Builder.CreateCall(smax, ActualOps, "tmp");
return true;
}
case ALTIVEC_BUILTIN_ABSS_V4SI:
@@ -349,10 +349,10 @@
Function *subss = Intrinsic::getDeclaration(TheModule, subss_iid[N]);
Value *ActualOps[] = {Constant::getNullValue(ResultType), Ops[0] };
- Result = Builder.CreateCall(subss, ActualOps, ActualOps+2, "tmp");
+ Result = Builder.CreateCall(subss, ActualOps, "tmp");
ActualOps[0] = Ops[0];
ActualOps[1] = Result;
- Result = Builder.CreateCall(smax, ActualOps, ActualOps+2, "tmp");
+ Result = Builder.CreateCall(smax, ActualOps, "tmp");
return true;
}
case ALTIVEC_BUILTIN_VPERM_4SI:
@@ -366,7 +366,7 @@
Value *ActualOps[] = { Op0, Op1, Ops[2]};
Result = Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
Intrinsic::ppc_altivec_vperm),
- ActualOps, ActualOps+3, "tmp");
+ ActualOps, "tmp");
Result = CastToType(Instruction::BitCast, Result, Ops[0]->getType());
return true;
}
@@ -382,7 +382,7 @@
Value *ActualOps[] = { Op0, Op1, Op2 };
Result = Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
Intrinsic::ppc_altivec_vsel),
- ActualOps, ActualOps+3, "tmp");
+ ActualOps, "tmp");
Result = CastToType(Instruction::BitCast, Result, Ops[0]->getType());
return true;
}
Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=135265&r1=135264&r2=135265&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Fri Jul 15 03:37:34 2011
@@ -395,7 +395,7 @@
Type *ArgTypes[3] = {SBP, SBP, IntPtr };
Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
Intrinsic::memcpy,
- ArgTypes), Ops, Ops+5);
+ ArgTypes), Ops);
AI->setName(NameStack.back());
}
@@ -1667,7 +1667,7 @@
Type *ArgTypes[3] = {SBP, SBP, IntPtr };
Builder.CreateCall(Intrinsic::getDeclaration(TheModule, Intrinsic::memcpy,
- ArgTypes), Ops, Ops+5);
+ ArgTypes), Ops);
return Ops[0];
}
@@ -1685,7 +1685,7 @@
Type *ArgTypes[3] = {SBP, SBP, IntPtr };
Builder.CreateCall(Intrinsic::getDeclaration(TheModule, Intrinsic::memmove,
- ArgTypes), Ops, Ops+5);
+ ArgTypes), Ops);
return Ops[0];
}
@@ -1703,7 +1703,7 @@
Type *ArgTypes[2] = {SBP, IntPtr };
Builder.CreateCall(Intrinsic::getDeclaration(TheModule, Intrinsic::memset,
- ArgTypes), Ops, Ops+5);
+ ArgTypes), Ops);
return Ops[0];
}
@@ -1726,7 +1726,7 @@
ConstantPointerNull::get(Ty)
};
- Builder.CreateCall(gcrootFun, Ops, Ops+2);
+ Builder.CreateCall(gcrootFun, Ops);
}
// Emits annotate intrinsic if the decl has the annotate attribute set.
@@ -1774,7 +1774,7 @@
lineNo
};
- Builder.CreateCall(annotateFun, Ops, Ops+4);
+ Builder.CreateCall(annotateFun, Ops);
}
// Get next annotate attribute.
@@ -2297,8 +2297,7 @@
}
// Emit the selector call.
- Value *Select = Builder.CreateCall(FuncEHSelector, Args.begin(), Args.end(),
- "eh_select");
+ Value *Select = Builder.CreateCall(FuncEHSelector, Args, "eh_select");
Builder.CreateStore(Select, ExceptionSelectorValue);
// Branch to the post landing pad for the first reachable handler.
assert(!Handlers.empty() && "Landing pad but no handler?");
@@ -3106,7 +3105,7 @@
Value *Call;
if (!LandingPad) {
- Call = Builder.CreateCall(Callee, CallOperands.begin(), CallOperands.end());
+ Call = Builder.CreateCall(Callee, CallOperands);
cast<CallInst>(Call)->setCallingConv(CallingConvention);
cast<CallInst>(Call)->setAttributes(PAL);
@@ -3146,8 +3145,7 @@
// LLVM LOCAL - end radar 7885482
} else {
BasicBlock *NextBlock = BasicBlock::Create(Context, "invcont");
- Call = Builder.CreateInvoke(Callee, NextBlock, LandingPad,
- CallOperands.begin(), CallOperands.end());
+ Call = Builder.CreateInvoke(Callee, NextBlock, LandingPad, CallOperands);
cast<InvokeInst>(Call)->setCallingConv(CallingConvention);
cast<InvokeInst>(Call)->setAttributes(PAL);
EmitBlock(NextBlock);
@@ -3451,15 +3449,15 @@
// HF -> something cast is performed as HF -> SF -> something
Value *Result =
Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
- Intrinsic::convert_from_fp16),
- &V, &V+1);
+ Intrinsic::convert_from_fp16),
+ V);
return CastToAnyType(Result, false, ConvertType(toty), ExpIsSigned);
} else if (SCALAR_FLOAT_TYPE_P (toty) && TYPE_PRECISION (toty) == 16) {
// something -> HF cast is performed as something -> SF -> HF
V = CastToAnyType(V, OpIsSigned, Type::getFloatTy(Context), false);
return Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
- Intrinsic::convert_to_fp16),
- &V, &V+1);
+ Intrinsic::convert_to_fp16),
+ V);
}
return 0;
@@ -5178,7 +5176,7 @@
Value *Asm = InlineAsm::get(FTy, NewAsmStr, ConstraintStr,
HasSideEffects, ASM_ASM_BLOCK(exp));
- CallInst *CV = Builder.CreateCall(Asm, CallOps.begin(), CallOps.end(),
+ CallInst *CV = Builder.CreateCall(Asm, CallOps,
CallResultTypes.empty() ? "" : "asmtmp");
CV->setDoesNotThrow();
@@ -5344,7 +5342,7 @@
Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
Intrinsic::memory_barrier),
- C, C + 5);
+ C);
}
Value *
@@ -5370,7 +5368,7 @@
#endif
Value *Result =
- Builder.CreateCall(Intrinsic::getDeclaration(TheModule, id, Ty), C, C + 2);
+ Builder.CreateCall(Intrinsic::getDeclaration(TheModule, id, Ty), C);
// The gcc builtins are also full memory barriers.
// FIXME: __sync_lock_test_and_set and __sync_lock_release require less.
@@ -5414,7 +5412,7 @@
Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
Intrinsic::atomic_cmp_swap,
Ty),
- C, C + 3);
+ C);
// The gcc builtins are also full memory barriers.
// FIXME: __sync_lock_test_and_set and __sync_lock_release require less.
@@ -5577,7 +5575,7 @@
Result = Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
Intrinsic::objectsize,
Ty),
- Args, Args + 2);
+ Args);
return true;
}
// Unary bit counting intrinsics.
@@ -5774,7 +5772,7 @@
Result = Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
Intrinsic::annotation,
Ty),
- Args.begin(), Args.end());
+ Args);
return true;
}
@@ -5786,7 +5784,7 @@
Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
Intrinsic::memory_barrier),
- C, C + 5);
+ C);
return true;
}
#if defined(TARGET_ALPHA) || defined(TARGET_386) || defined(TARGET_POWERPC) \
@@ -5945,7 +5943,7 @@
Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
Intrinsic::atomic_load_add,
Ty),
- C, C + 2);
+ C);
// The gcc builtins are also full memory barriers.
// FIXME: __sync_lock_test_and_set and __sync_lock_release require less.
@@ -5992,7 +5990,7 @@
Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
Intrinsic::atomic_load_sub,
Ty),
- C, C + 2);
+ C);
// The gcc builtins are also full memory barriers.
// FIXME: __sync_lock_test_and_set and __sync_lock_release require less.
@@ -6039,7 +6037,7 @@
Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
Intrinsic::atomic_load_or,
Ty),
- C, C + 2);
+ C);
// The gcc builtins are also full memory barriers.
// FIXME: __sync_lock_test_and_set and __sync_lock_release require less.
@@ -6086,7 +6084,7 @@
Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
Intrinsic::atomic_load_and,
Ty),
- C, C + 2);
+ C);
// The gcc builtins are also full memory barriers.
// FIXME: __sync_lock_test_and_set and __sync_lock_release require less.
@@ -6133,7 +6131,7 @@
Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
Intrinsic::atomic_load_xor,
Ty),
- C, C + 2);
+ C);
// The gcc builtins are also full memory barriers.
// FIXME: __sync_lock_test_and_set and __sync_lock_release require less.
@@ -6180,7 +6178,7 @@
Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
Intrinsic::atomic_load_nand,
Ty),
- C, C + 2);
+ C);
// The gcc builtins are also full memory barriers.
// FIXME: __sync_lock_test_and_set and __sync_lock_release require less.
@@ -6316,7 +6314,7 @@
Args.push_back(Pow);
return Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
Intrinsic::powi, Ty),
- Args.begin(), Args.end());
+ Args);
}
Value *TreeToLLVM::EmitBuiltinPOW(tree exp) {
@@ -6333,7 +6331,7 @@
Args.push_back(Pow);
return Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
Intrinsic::pow, Ty),
- Args.begin(), Args.end());
+ Args);
}
bool TreeToLLVM::EmitBuiltinConstantP(tree exp, Value *&Result) {
@@ -6678,8 +6676,7 @@
SmallVector<Value *, 2> Args;
Args.push_back(Offset);
Args.push_back(Handler);
- Builder.CreateCall(Intrinsic::getDeclaration(TheModule, IID),
- Args.begin(), Args.end());
+ Builder.CreateCall(Intrinsic::getDeclaration(TheModule, IID), Args);
Result = Builder.CreateUnreachable();
EmitBlock(BasicBlock::Create(Context, ""));
@@ -6868,7 +6865,7 @@
Args.push_back(BitCastToType(Arg2, VPTy));
Builder.CreateCall(Intrinsic::getDeclaration(TheModule, Intrinsic::vacopy),
- Args.begin(), Args.end());
+ Args);
return true;
}
@@ -6893,7 +6890,7 @@
Function *Intr = Intrinsic::getDeclaration(TheModule,
Intrinsic::init_trampoline);
- Result = Builder.CreateCall(Intr, Ops, Ops+3, "tramp");
+ Result = Builder.CreateCall(Intr, Ops, "tramp");
return true;
}
@@ -7119,7 +7116,7 @@
};
const Type* FieldPtrType = FieldPtr->getType();
- FieldPtr = Builder.CreateCall(Fn, Ops, Ops+4);
+ FieldPtr = Builder.CreateCall(Fn, Ops);
FieldPtr = BitCastToType(FieldPtr, FieldPtrType);
}
Modified: llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp?rev=135265&r1=135264&r2=135265&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Fri Jul 15 03:37:34 2011
@@ -2056,7 +2056,7 @@
Value *Args[] = { MDNode::get(Storage->getContext(), Storage),
D };
- return CallInst::Create(DeclareFn, Args, Args+2, "", InsertBefore);
+ return CallInst::Create(DeclareFn, Args, "", InsertBefore);
}
/// InsertDeclare - Insert a new llvm.dbg.declare intrinsic call.
@@ -2073,9 +2073,9 @@
// If this block already has a terminator then insert this intrinsic
// before the terminator.
if (TerminatorInst *T = InsertAtEnd->getTerminator())
- return CallInst::Create(DeclareFn, Args, Args+2, "", T);
+ return CallInst::Create(DeclareFn, Args, "", T);
else
- return CallInst::Create(DeclareFn, Args, Args+2, "", InsertAtEnd);}
+ return CallInst::Create(DeclareFn, Args, "", InsertAtEnd);}
/// InsertDbgValueIntrinsic - Insert a new llvm.dbg.value intrinsic call.
Instruction *DIFactory::InsertDbgValueIntrinsic(Value *V, uint64_t Offset,
@@ -2089,7 +2089,7 @@
Value *Args[] = { MDNode::get(V->getContext(), V),
ConstantInt::get(Type::getInt64Ty(V->getContext()), Offset),
D };
- return CallInst::Create(ValueFn, Args, Args+3, "", InsertBefore);
+ return CallInst::Create(ValueFn, Args, "", InsertBefore);
}
/// InsertDbgValueIntrinsic - Insert a new llvm.dbg.value intrinsic call.
@@ -2104,7 +2104,7 @@
Value *Args[] = { MDNode::get(V->getContext(), V),
ConstantInt::get(Type::getInt64Ty(V->getContext()), Offset),
D };
- return CallInst::Create(ValueFn, Args, Args+3, "", InsertAtEnd);
+ return CallInst::Create(ValueFn, Args, "", InsertAtEnd);
}
// RecordType - Record DIType in a module such that it is not lost even if
More information about the llvm-commits
mailing list