mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-11-01 15:17:25 +00:00
Finally land the InvokeInst operand reordering.
I have audited all getOperandNo calls now, fixing hidden assumptions. CallSite related uglyness will be eliminated successively. Note this patch has a long and griveous history, for all the back-and-forths have a look at CallSite.h's log. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@99399 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -1717,7 +1717,8 @@ static bool AddressIsTaken(const GlobalValue *GV) {
|
||||
return true; // Storing addr of GV.
|
||||
} else if (isa<InvokeInst>(U) || isa<CallInst>(U)) {
|
||||
// Make sure we are calling the function, not passing the address.
|
||||
if (UI.getOperandNo() != 0)
|
||||
CallSite CS((Instruction*)U);
|
||||
if (!CS.isCallee(UI))
|
||||
return true;
|
||||
} else if (const LoadInst *LI = dyn_cast<LoadInst>(U)) {
|
||||
if (LI->isVolatile())
|
||||
|
||||
@@ -79,7 +79,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);
|
||||
|
||||
Reference in New Issue
Block a user