[llvm-branch-commits] [llvm-branch] r110232 - /llvm/branches/Apple/Pertwee/lib/Target/ARM/ARMISelLowering.cpp

[Dale Johannesen]

Author: johannes
Date: Wed Aug  4 13:31:08 2010
New Revision: 110232

URL: http://llvm.org/viewvc/llvm-project?rev=110232&view=rev
Log:
--- Merging r110226 into '.':
U    lib/Target/ARM/ARMISelLowering.cpp


Modified:
    llvm/branches/Apple/Pertwee/lib/Target/ARM/ARMISelLowering.cpp

Modified: llvm/branches/Apple/Pertwee/lib/Target/ARM/ARMISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Pertwee/lib/Target/ARM/ARMISelLowering.cpp?rev=110232&r1=110231&r2=110232&view=diff
==============================================================================
--- llvm/branches/Apple/Pertwee/lib/Target/ARM/ARMISelLowering.cpp (original)
+++ llvm/branches/Apple/Pertwee/lib/Target/ARM/ARMISelLowering.cpp Wed Aug  4 13:31:08 2010
@@ -51,12 +51,6 @@
 
 STATISTIC(NumTailCalls, "Number of tail calls");
 
-// This option should go away when tail calls fully work.
-static cl::opt<bool>
-EnableARMTailCalls("arm-tail-calls", cl::Hidden,
-  cl::desc("Generate tail calls (TEMPORARY OPTION)."),
-  cl::init(true));
-
 // This option should go away when Machine LICM is smart enough to hoist a 
 // reg-to-reg VDUP.
 static cl::opt<bool>
@@ -1121,9 +1115,6 @@
   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,