6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-19 06:31:18 +00:00
Code Issues Projects Releases Wiki Activity

When DAE drops the varargs part of a function, ensure any

Browse Source 
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
This commit is contained in:
Duncan Sands 2008-01-11 23:13:45 +00:00
parent 3d79478671
commit bfc5ae6df0
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Transforms/IPO/DeadArgumentElimination.cpp
View File

@ -175,16 +175,29 @@ bool DAE::DeleteDeadVarargs(Function &Fn) {
// Pass all the same arguments. // Pass all the same arguments.
Args.assign(CS.arg_begin(), CS.arg_begin()+NumArgs); 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; Instruction *New;
if (InvokeInst *II = dyn_cast<InvokeInst>(Call)) { if (InvokeInst *II = dyn_cast<InvokeInst>(Call)) {
New = new InvokeInst(NF, II->getNormalDest(), II->getUnwindDest(), New = new InvokeInst(NF, II->getNormalDest(), II->getUnwindDest(),
Args.begin(), Args.end(), "", Call); Args.begin(), Args.end(), "", Call);
cast<InvokeInst>(New)->setCallingConv(CS.getCallingConv()); cast<InvokeInst>(New)->setCallingConv(CS.getCallingConv());
cast<InvokeInst>(New)->setParamAttrs(CS.getParamAttrs()); cast<InvokeInst>(New)->setParamAttrs(PAL);
} else { } else {
New = new CallInst(NF, Args.begin(), Args.end(), "", Call); New = new CallInst(NF, Args.begin(), Args.end(), "", Call);
cast<CallInst>(New)->setCallingConv(CS.getCallingConv()); cast<CallInst>(New)->setCallingConv(CS.getCallingConv());
cast<CallInst>(New)->setParamAttrs(CS.getParamAttrs()); cast<CallInst>(New)->setParamAttrs(PAL);
if (cast<CallInst>(Call)->isTailCall()) if (cast<CallInst>(Call)->isTailCall())
cast<CallInst>(New)->setTailCall(); cast<CallInst>(New)->setTailCall();
} }

5
test/Transforms/DeadArgElim/2007-12-20-ParamAttrs.ll
View File

@ -2,6 +2,9 @@
; RUN: llvm-as < %s | opt -deadargelim | llvm-dis | grep signext | count 2 ; 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 inreg
; RUN: llvm-as < %s | opt -deadargelim | llvm-dis | not grep zeroext ; 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 @g = global i8 0
@ -11,6 +14,6 @@ define internal i8 @foo(i8* inreg %p, i8 signext %y, ... ) zeroext nounwind {
} }
define i32 @bar() { 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 ret i32 0
} }