mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-07-03 11:24:18 +00:00
Second installment of "BasicBlock operands to the back"
changes. For InvokeInst now all arguments begin at op_begin(). The Callee, Cont and Fail are now faster to get by access relative to op_end(). This patch introduces some temporary uglyness in CallSite. Next I'll bring CallInst up to a similar scheme and then the uglyness will magically vanish. This patch also exposes all the reliance of the libraries on InvokeInst's operand ordering. I am thinking of taking care of that too. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@66920 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@ -356,14 +356,14 @@ DAE::Liveness DAE::SurveyUse(Value::use_iterator U, UseVector &MaybeLiveUses,
|
||||
// argument, since if it was the function argument this would be an
|
||||
// indirect call and the we know can't be looking at a value of the
|
||||
// label type (for the invoke instruction).
|
||||
unsigned ArgNo = CS.getArgumentNo(U.getOperandNo());
|
||||
unsigned ArgNo = CS.getArgumentNo(U);
|
||||
|
||||
if (ArgNo >= F->getFunctionType()->getNumParams())
|
||||
// The value is passed in through a vararg! Must be live.
|
||||
return Live;
|
||||
|
||||
assert(CS.getArgument(ArgNo)
|
||||
== CS.getInstruction()->getOperand(U.getOperandNo())
|
||||
assert(CS.getArgument(ArgNo)
|
||||
== CS.getInstruction()->getOperand(U.getOperandNo())
|
||||
&& "Argument is not where we expected it");
|
||||
|
||||
// Value passed to a normal call. It's only live when the corresponding
|
||||
|
@ -170,7 +170,7 @@ bool PruneEH::SimplifyFunction(Function *F) {
|
||||
for (Function::iterator BB = F->begin(), E = F->end(); BB != E; ++BB) {
|
||||
if (InvokeInst *II = dyn_cast<InvokeInst>(BB->getTerminator()))
|
||||
if (II->doesNotThrow()) {
|
||||
SmallVector<Value*, 8> Args(II->op_begin()+3, II->op_end());
|
||||
SmallVector<Value*, 8> Args(II->op_begin(), II->op_end() - 3);
|
||||
// Insert a call instruction before the invoke.
|
||||
CallInst *Call = CallInst::Create(II->getCalledValue(),
|
||||
Args.begin(), Args.end(), "", II);
|
||||
|
@ -78,7 +78,7 @@ static void ChangeToUnreachable(Instruction *I) {
|
||||
/// ChangeToCall - Convert the specified invoke into a normal call.
|
||||
static void ChangeToCall(InvokeInst *II) {
|
||||
BasicBlock *BB = II->getParent();
|
||||
SmallVector<Value*, 8> Args(II->op_begin()+3, II->op_end());
|
||||
SmallVector<Value*, 8> Args(II->op_begin(), II->op_end() - 3);
|
||||
CallInst *NewCall = CallInst::Create(II->getCalledValue(), Args.begin(),
|
||||
Args.end(), "", II);
|
||||
NewCall->takeName(II);
|
||||
|
@ -221,7 +221,7 @@ bool LowerInvoke::insertCheapEHSupport(Function &F) {
|
||||
bool Changed = false;
|
||||
for (Function::iterator BB = F.begin(), E = F.end(); BB != E; ++BB)
|
||||
if (InvokeInst *II = dyn_cast<InvokeInst>(BB->getTerminator())) {
|
||||
std::vector<Value*> CallArgs(II->op_begin()+3, II->op_end());
|
||||
std::vector<Value*> CallArgs(II->op_begin(), II->op_end() - 3);
|
||||
// Insert a normal call instruction...
|
||||
CallInst *NewCall = CallInst::Create(II->getCalledValue(),
|
||||
CallArgs.begin(), CallArgs.end(), "",II);
|
||||
@ -290,7 +290,7 @@ void LowerInvoke::rewriteExpensiveInvoke(InvokeInst *II, unsigned InvokeNo,
|
||||
CatchSwitch->addCase(InvokeNoC, II->getUnwindDest());
|
||||
|
||||
// Insert a normal call instruction.
|
||||
std::vector<Value*> CallArgs(II->op_begin()+3, II->op_end());
|
||||
std::vector<Value*> CallArgs(II->op_begin(), II->op_end() - 3);
|
||||
CallInst *NewCall = CallInst::Create(II->getCalledValue(),
|
||||
CallArgs.begin(), CallArgs.end(), "",
|
||||
II);
|
||||
|
Reference in New Issue
Block a user