diff options
author | Victor Huang <wei.huang@ibm.com> | 2020-06-03 10:37:07 -0500 |
---|---|---|
committer | Victor Huang <wei.huang@ibm.com> | 2020-06-03 10:37:45 -0500 |
commit | 3abe7aca455b9a8b9b0f1e1efdaffb50193516dd (patch) | |
tree | ae35b437499988a82d111e3a08c338235a501215 /llvm/lib/CodeGen/Analysis.cpp | |
parent | 37d93b528c1c6dc0f77ee517936de61816707023 (diff) | |
download | llvm-3abe7aca455b9a8b9b0f1e1efdaffb50193516dd.zip llvm-3abe7aca455b9a8b9b0f1e1efdaffb50193516dd.tar.gz llvm-3abe7aca455b9a8b9b0f1e1efdaffb50193516dd.tar.bz2 |
[CodeGen] Enable tail call position check for speculatable functions
In the function "Analysis.cpp:isInTailCallPosition", it only checks whether
a call is in a tail call position if the call has side effects, access memory
or it is not safe to speculative execute. Therefore, a speculatable function
will not go through tail call position check and improperly tail called when
it is not in a tail-call position. This patch enables tail call position check
for speculatable functions.
Differential Revision: https://reviews.llvm.org/D80661
Diffstat (limited to 'llvm/lib/CodeGen/Analysis.cpp')
-rw-r--r-- | llvm/lib/CodeGen/Analysis.cpp | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/llvm/lib/CodeGen/Analysis.cpp b/llvm/lib/CodeGen/Analysis.cpp index c7aafb0..7da28ff 100644 --- a/llvm/lib/CodeGen/Analysis.cpp +++ b/llvm/lib/CodeGen/Analysis.cpp @@ -530,24 +530,23 @@ bool llvm::isInTailCallPosition(const CallBase &Call, const TargetMachine &TM) { // If I will have a chain, make sure no other instruction that will have a // chain interposes between I and the return. - if (Call.mayHaveSideEffects() || Call.mayReadFromMemory() || - !isSafeToSpeculativelyExecute(&Call)) - for (BasicBlock::const_iterator BBI = std::prev(ExitBB->end(), 2);; --BBI) { - if (&*BBI == &Call) - break; - // Debug info intrinsics do not get in the way of tail call optimization. - if (isa<DbgInfoIntrinsic>(BBI)) + // Check for all calls including speculatable functions. + for (BasicBlock::const_iterator BBI = std::prev(ExitBB->end(), 2);; --BBI) { + if (&*BBI == &Call) + break; + // Debug info intrinsics do not get in the way of tail call optimization. + if (isa<DbgInfoIntrinsic>(BBI)) + continue; + // A lifetime end or assume intrinsic should not stop tail call + // optimization. + if (const IntrinsicInst *II = dyn_cast<IntrinsicInst>(BBI)) + if (II->getIntrinsicID() == Intrinsic::lifetime_end || + II->getIntrinsicID() == Intrinsic::assume) continue; - // A lifetime end or assume intrinsic should not stop tail call - // optimization. - if (const IntrinsicInst *II = dyn_cast<IntrinsicInst>(BBI)) - if (II->getIntrinsicID() == Intrinsic::lifetime_end || - II->getIntrinsicID() == Intrinsic::assume) - continue; - if (BBI->mayHaveSideEffects() || BBI->mayReadFromMemory() || - !isSafeToSpeculativelyExecute(&*BBI)) - return false; - } + if (BBI->mayHaveSideEffects() || BBI->mayReadFromMemory() || + !isSafeToSpeculativelyExecute(&*BBI)) + return false; + } const Function *F = ExitBB->getParent(); return returnTypeIsEligibleForTailCall( |