[llvm] r216425 - musttail: Don't eliminate varargs packs if there is a forwarding call
Reid Kleckner
reid at kleckner.net
Mon Aug 25 17:59:51 PDT 2014
Author: rnk
Date: Mon Aug 25 19:59:51 2014
New Revision: 216425
URL: http://llvm.org/viewvc/llvm-project?rev=216425&view=rev
Log:
musttail: Don't eliminate varargs packs if there is a forwarding call
Also clean up and beef up this grep test for the feature.
Modified:
llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp
llvm/trunk/test/Transforms/DeadArgElim/dead_vaargs.ll
Modified: llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp?rev=216425&r1=216424&r2=216425&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp Mon Aug 25 19:59:51 2014
@@ -199,10 +199,15 @@ bool DAE::DeleteDeadVarargs(Function &Fn
return false;
// Okay, we know we can transform this function if safe. Scan its body
- // looking for calls to llvm.vastart.
+ // looking for calls marked musttail or calls to llvm.vastart.
for (Function::iterator BB = Fn.begin(), E = Fn.end(); BB != E; ++BB) {
for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I) {
- if (IntrinsicInst *II = dyn_cast<IntrinsicInst>(I)) {
+ CallInst *CI = dyn_cast<CallInst>(I);
+ if (!CI)
+ continue;
+ if (CI->isMustTailCall())
+ return false;
+ if (IntrinsicInst *II = dyn_cast<IntrinsicInst>(CI)) {
if (II->getIntrinsicID() == Intrinsic::vastart)
return false;
}
Modified: llvm/trunk/test/Transforms/DeadArgElim/dead_vaargs.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/DeadArgElim/dead_vaargs.ll?rev=216425&r1=216424&r2=216425&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/DeadArgElim/dead_vaargs.ll (original)
+++ llvm/trunk/test/Transforms/DeadArgElim/dead_vaargs.ll Mon Aug 25 19:59:51 2014
@@ -1,12 +1,36 @@
-; RUN: opt < %s -deadargelim -S | not grep 47
-; RUN: opt < %s -deadargelim -S | not grep 1.0
+; RUN: opt < %s -deadargelim -S | FileCheck %s
define i32 @bar(i32 %A) {
- %tmp4 = tail call i32 (i32, ...)* @foo( i32 %A, i32 %A, i32 %A, i32 %A, i64 47, double 1.000000e+00 ) ; <i32> [#uses=1]
- ret i32 %tmp4
+ call void (i32, ...)* @thunk(i32 %A, i64 47, double 1.000000e+00)
+ %a = call i32 (i32, ...)* @has_vastart(i32 %A, i64 47, double 1.000000e+00)
+ %b = call i32 (i32, ...)* @no_vastart( i32 %A, i32 %A, i32 %A, i32 %A, i64 47, double 1.000000e+00 )
+ %c = add i32 %a, %b
+ ret i32 %c
}
+; CHECK-LABEL: define i32 @bar
+; CHECK: call void (i32, ...)* @thunk(i32 %A, i64 47, double 1.000000e+00)
+; CHECK: call i32 (i32, ...)* @has_vastart(i32 %A, i64 47, double 1.000000e+00)
+; CHECK: call i32 @no_vastart(i32 %A)
-define internal i32 @foo(i32 %X, ...) {
- ret i32 %X
+declare void @thunk_target(i32 %X, ...)
+
+define internal void @thunk(i32 %X, ...) {
+ musttail call void(i32, ...)* @thunk_target(i32 %X, ...)
+ ret void
+}
+; CHECK-LABEL: define internal void @thunk(i32 %X, ...)
+; CHECK: musttail call void (i32, ...)* @thunk_target(i32 %X, ...)
+
+define internal i32 @has_vastart(i32 %X, ...) {
+ %valist = alloca i8
+ call void @llvm.va_start(i8* %valist)
+ ret i32 %X
}
+; CHECK-LABEL: define internal i32 @has_vastart(i32 %X, ...)
+declare void @llvm.va_start(i8*)
+
+define internal i32 @no_vastart(i32 %X, ...) {
+ ret i32 %X
+}
+; CHECK-LABEL: define internal i32 @no_vastart(i32 %X)
More information about the llvm-commits
mailing list