aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Transforms/Scalar/TailRecursionElimination.cpp9
-rw-r--r--test/Transforms/TailCallElim/no-return-calls.ll12
2 files changed, 17 insertions, 4 deletions
diff --git a/lib/Transforms/Scalar/TailRecursionElimination.cpp b/lib/Transforms/Scalar/TailRecursionElimination.cpp
index 162d902cfa..913dd73cc1 100644
--- a/lib/Transforms/Scalar/TailRecursionElimination.cpp
+++ b/lib/Transforms/Scalar/TailRecursionElimination.cpp
@@ -184,10 +184,11 @@ bool TailCallElim::runOnFunction(Function &F) {
if (!FunctionContainsEscapingAllocas)
for (Function::iterator BB = F.begin(), E = F.end(); BB != E; ++BB)
for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I)
- if (CallInst *CI = dyn_cast<CallInst>(I)) {
- CI->setTailCall();
- MadeChange = true;
- }
+ if (CallInst *CI = dyn_cast<CallInst>(I))
+ if (!CI->doesNotReturn()) {
+ CI->setTailCall();
+ MadeChange = true;
+ }
return MadeChange;
}
diff --git a/test/Transforms/TailCallElim/no-return-calls.ll b/test/Transforms/TailCallElim/no-return-calls.ll
new file mode 100644
index 0000000000..f5643ae333
--- /dev/null
+++ b/test/Transforms/TailCallElim/no-return-calls.ll
@@ -0,0 +1,12 @@
+; RUN: opt < %s -tailcallelim -S | FileCheck %s
+
+define void @t() nounwind ssp {
+entry:
+; CHECK: entry:
+; CHECK: %0 = call i32 @foo()
+; CHECK: ret void
+ %0 = call i32 @foo() nounwind noreturn
+ ret void
+}
+
+declare i32 @foo()