diff options
author | Eric Christopher <echristo@gmail.com> | 2017-12-07 22:26:19 +0000 |
---|---|---|
committer | Eric Christopher <echristo@gmail.com> | 2017-12-07 22:26:19 +0000 |
commit | a469acac0306069b26377240fb724f6eaa47953c (patch) | |
tree | 46419183216be8f21977300eec01e2c403ccf2e8 /llvm/lib/Target | |
parent | b0c97e566fca549aa748da67019fc5bf7d298af7 (diff) | |
download | bcm5719-llvm-a469acac0306069b26377240fb724f6eaa47953c.tar.gz bcm5719-llvm-a469acac0306069b26377240fb724f6eaa47953c.zip |
Temporarily revert "[PowerPC] Allow tail calls of fastcc functions from C CallingConv functions."
It is causing sanitizer failures on llvm tests in a bootstrapped compiler. No bot link since it's currently down, but following up to get the bot up.
This reverts commit r319218.
llvm-svn: 320106
Diffstat (limited to 'llvm/lib/Target')
-rw-r--r-- | llvm/lib/Target/PowerPC/PPCISelLowering.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/llvm/lib/Target/PowerPC/PPCISelLowering.cpp b/llvm/lib/Target/PowerPC/PPCISelLowering.cpp index f885127e6aa..3fe9fe73499 100644 --- a/llvm/lib/Target/PowerPC/PPCISelLowering.cpp +++ b/llvm/lib/Target/PowerPC/PPCISelLowering.cpp @@ -4397,18 +4397,13 @@ hasSameArgumentList(const Function *CallerFn, ImmutableCallSite CS) { static bool areCallingConvEligibleForTCO_64SVR4(CallingConv::ID CallerCC, CallingConv::ID CalleeCC) { - // tail calls are possible with fastcc and ccc. - auto isTailCallableCC = [] (CallingConv::ID CC){ - return CC == CallingConv::C || CC == CallingConv::Fast; - }; - if (!isTailCallableCC(CallerCC) || !isTailCallableCC(CalleeCC)) + // Tail or Sibling call optimization (TCO/SCO) needs callee and caller to + // have the same calling convention. + if (CallerCC != CalleeCC) return false; - // We can safely tail call both fastcc and ccc callees from a c calling - // convention caller. If the caller is fastcc, we may have less stack space - // then a non-fastcc caller with the same signature so disable tail-calls in - // that case. - return CallerCC == CallingConv::C || CallerCC == CalleeCC; + // Tail or Sibling calls can be done with fastcc/ccc. + return (CallerCC == CallingConv::Fast || CallerCC == CallingConv::C); } bool |