When DAE drops the varargs part of a function, ensure any
attributes on the vararg call arguments are also dropped.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@45892 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Transforms/IPO/DeadArgumentElimination.cpp b/lib/Transforms/IPO/DeadArgumentElimination.cpp
index 3550d71..b877012 100644
--- a/lib/Transforms/IPO/DeadArgumentElimination.cpp
+++ b/lib/Transforms/IPO/DeadArgumentElimination.cpp
@@ -175,16 +175,29 @@
// Pass all the same arguments.
Args.assign(CS.arg_begin(), CS.arg_begin()+NumArgs);
+ // Drop any attributes that were on the vararg arguments.
+ const ParamAttrsList *PAL = CS.getParamAttrs();
+ if (PAL && PAL->getParamIndex(PAL->size() - 1) > NumArgs) {
+ ParamAttrsVector ParamAttrsVec;
+ for (unsigned i = 0; PAL->getParamIndex(i) <= NumArgs; ++i) {
+ ParamAttrsWithIndex PAWI;
+ PAWI = ParamAttrsWithIndex::get(PAL->getParamIndex(i),
+ PAL->getParamAttrsAtIndex(i));
+ ParamAttrsVec.push_back(PAWI);
+ }
+ PAL = ParamAttrsList::get(ParamAttrsVec);
+ }
+
Instruction *New;
if (InvokeInst *II = dyn_cast<InvokeInst>(Call)) {
New = new InvokeInst(NF, II->getNormalDest(), II->getUnwindDest(),
Args.begin(), Args.end(), "", Call);
cast<InvokeInst>(New)->setCallingConv(CS.getCallingConv());
- cast<InvokeInst>(New)->setParamAttrs(CS.getParamAttrs());
+ cast<InvokeInst>(New)->setParamAttrs(PAL);
} else {
New = new CallInst(NF, Args.begin(), Args.end(), "", Call);
cast<CallInst>(New)->setCallingConv(CS.getCallingConv());
- cast<CallInst>(New)->setParamAttrs(CS.getParamAttrs());
+ cast<CallInst>(New)->setParamAttrs(PAL);
if (cast<CallInst>(Call)->isTailCall())
cast<CallInst>(New)->setTailCall();
}