Use a CallSite to find the nth argument of a call/invoke instruction instead of
using getOperand() directly. This makes things work with invoke instructions as
well.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@52489 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Transforms/IPO/IPConstantPropagation.cpp b/lib/Transforms/IPO/IPConstantPropagation.cpp
index f528b88..fa004fd 100644
--- a/lib/Transforms/IPO/IPConstantPropagation.cpp
+++ b/lib/Transforms/IPO/IPConstantPropagation.cpp
@@ -218,13 +218,15 @@
// constant.
bool MadeChange = false;
for (Value::use_iterator UI = F.use_begin(), E = F.use_end(); UI != E; ++UI) {
- // Make sure this is an invoke or call and that the use is for the callee.
- if (!(isa<InvokeInst>(*UI) || isa<CallInst>(*UI)) ||
- UI.getOperandNo() != 0) {
+ CallSite CS = CallSite::get(*UI);
+ Instruction* Call = CS.getInstruction();
+
+ // Not a call instruction or a call instruction that's not calling F
+ // directly?
+ if (!Call || UI.getOperandNo() != 0)
continue;
- }
- Instruction *Call = cast<Instruction>(*UI);
+ // Call result not used?
if (Call->use_empty())
continue;
@@ -234,9 +236,8 @@
Value* New = RetVals[0];
if (Argument *A = dyn_cast<Argument>(New))
// Was an argument returned? Then find the corresponding argument in
- // the call instruction and use that. Add 1 to the argument number
- // to skip the first argument (the function itself).
- New = Call->getOperand(A->getArgNo() + 1);
+ // the call instruction and use that.
+ New = CS.getArgument(A->getArgNo());
Call->replaceAllUsesWith(New);
continue;
}
@@ -267,9 +268,8 @@
if (New) {
if (Argument *A = dyn_cast<Argument>(New))
// Was an argument returned? Then find the corresponding argument in
- // the call instruction and use that. Add 1 to the argument number
- // to skip the first argument (the function itself).
- New = Call->getOperand(A->getArgNo() + 1);
+ // the call instruction and use that.
+ New = CS.getArgument(A->getArgNo());
Ins->replaceAllUsesWith(New);
Ins->eraseFromParent();
}