[llvm-commits] [llvm] r95295 - in /llvm/trunk: lib/Target/X86/X86ISelLowering.cpp test/CodeGen/X86/tailcall2.ll

[Evan Cheng]

Author: evancheng
Date: Thu Feb  4 00:47:24 2010
New Revision: 95295

URL: http://llvm.org/viewvc/llvm-project?rev=95295&view=rev
Log:
Re-enable x86 tail call optimization.

Modified:
    llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
    llvm/trunk/test/CodeGen/X86/tailcall2.ll

Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=95295&r1=95294&r2=95295&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Thu Feb  4 00:47:24 2010
@@ -52,7 +52,6 @@
 
 STATISTIC(NumTailCalls, "Number of tail calls");
 
-static cl::opt<unsigned> TailCallLimit("tailcall-limit", cl::init(0));
 static cl::opt<bool>
 DisableMMX("disable-mmx", cl::Hidden, cl::desc("Disable use of MMX"));
 
@@ -2271,8 +2270,6 @@
 
   // Look for obvious safe cases to perform tail call optimization that does not
   // requite ABI changes. This is what gcc calls sibcall.
-  if (NumTailCalls >= TailCallLimit)
-    return false;
 
   // Do not tail call optimize vararg calls for now.
   if (isVarArg)

Modified: llvm/trunk/test/CodeGen/X86/tailcall2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/tailcall2.ll?rev=95295&r1=95294&r2=95295&view=diff

==============================================================================
--- llvm/trunk/test/CodeGen/X86/tailcall2.ll (original)
+++ llvm/trunk/test/CodeGen/X86/tailcall2.ll Thu Feb  4 00:47:24 2010
@@ -1,6 +1,5 @@
 ; RUN: llc < %s -march=x86    -asm-verbose=false | FileCheck %s -check-prefix=32
 ; RUN: llc < %s -march=x86-64 -asm-verbose=false | FileCheck %s -check-prefix=64
-; XFAIL: *
 
 define void @t1(i32 %x) nounwind ssp {
 entry:
@@ -107,10 +106,10 @@
 define signext i16 @t8() nounwind ssp {
 entry:
 ; 32: t8:
-; 32: jmp {{_?}}bar3
+; 32: call {{_?}}bar3
 
 ; 64: t8:
-; 64: jmp {{_?}}bar3
+; 64: callq {{_?}}bar3
   %0 = tail call signext i16 @bar3() nounwind      ; <i16> [#uses=1]
   ret i16 %0
 }