[llvm-commits] [llvm] r105472 - /llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp

[Dale Johannesen]

Author: johannes
Date: Fri Jun  4 13:04:24 2010
New Revision: 105472

URL: http://llvm.org/viewvc/llvm-project?rev=105472&view=rev
Log:
More thoroughly disable tails calls by default.
8060143, although this doesn't fix the real problem with tail call.


Modified:
    llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp

Modified: llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp?rev=105472&r1=105471&r2=105472&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp Fri Jun  4 13:04:24 2010
@@ -999,14 +999,14 @@
   MachineFunction &MF = DAG.getMachineFunction();
   bool IsStructRet    = (Outs.empty()) ? false : Outs[0].Flags.isSRet();
   bool IsSibCall = false;
+  // Temporarily disable tail calls so things don't break.
+  if (!EnableARMTailCalls)
+    isTailCall = false;
   if (isTailCall) {
     // Check if it's really possible to do a tail call.
     isTailCall = IsEligibleForTailCallOptimization(Callee, CallConv,
                     isVarArg, IsStructRet, MF.getFunction()->hasStructRetAttr(),
                                                    Outs, Ins, DAG);
-    // Temporarily disable tail calls so things don't break.
-    if (!EnableARMTailCalls)
-      isTailCall = false;
     // We don't support GuaranteedTailCallOpt for ARM, only automatically
     // detected sibcalls.
     if (isTailCall) {