[llvm-commits] [llvm] r45892 - in /llvm/trunk: lib/Transforms/IPO/DeadArgumentElimination.cpp test/Transforms/DeadArgElim/2007-12-20-ParamAttrs.ll
Duncan Sands
baldrick at free.fr
Fri Jan 11 15:13:45 PST 2008
Author: baldrick
Date: Fri Jan 11 17:13:45 2008
New Revision: 45892
URL: http://llvm.org/viewvc/llvm-project?rev=45892&view=rev
Log:
When DAE drops the varargs part of a function, ensure any
attributes on the vararg call arguments are also dropped.
Modified:
llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp
llvm/trunk/test/Transforms/DeadArgElim/2007-12-20-ParamAttrs.ll
Modified: llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp?rev=45892&r1=45891&r2=45892&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp Fri Jan 11 17:13:45 2008
@@ -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();
}
Modified: llvm/trunk/test/Transforms/DeadArgElim/2007-12-20-ParamAttrs.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/DeadArgElim/2007-12-20-ParamAttrs.ll?rev=45892&r1=45891&r2=45892&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/DeadArgElim/2007-12-20-ParamAttrs.ll (original)
+++ llvm/trunk/test/Transforms/DeadArgElim/2007-12-20-ParamAttrs.ll Fri Jan 11 17:13:45 2008
@@ -2,6 +2,9 @@
; RUN: llvm-as < %s | opt -deadargelim | llvm-dis | grep signext | count 2
; RUN: llvm-as < %s | opt -deadargelim | llvm-dis | not grep inreg
; RUN: llvm-as < %s | opt -deadargelim | llvm-dis | not grep zeroext
+; RUN: llvm-as < %s | opt -deadargelim | llvm-dis | not grep byval
+
+ %struct = type { }
@g = global i8 0
@@ -11,6 +14,6 @@
}
define i32 @bar() {
- %A = call i8(i8*, i8, ...)* @foo(i8* inreg null, i8 signext 1, i8 2) zeroext nounwind
+ %A = call i8(i8*, i8, ...)* @foo(i8* inreg null, i8 signext 1, %struct* byval null ) zeroext nounwind
ret i32 0
}
More information about the llvm-commits
mailing list