Undo r94946 now all the tests are passing again.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@94970 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp
index e272d9b..5b76298 100644
--- a/lib/Target/X86/X86ISelLowering.cpp
+++ b/lib/Target/X86/X86ISelLowering.cpp
@@ -2263,17 +2263,6 @@
if (isVarArg)
return false;
- // Don't tail call optimize recursive call.
- GlobalAddressSDNode *G = dyn_cast<GlobalAddressSDNode>(Callee);
- const Function *CalleeF = G ? cast<Function>(G->getGlobal()) : 0;
- if (CallerF == CalleeF)
- return false;
- // If it's an indirect call, conversatively return false if the caller's
- // address is taken.
- if (!CalleeF &&
- !isa<ExternalSymbolSDNode>(Callee) && CallerF->hasAddressTaken())
- return false;
-
// Look for obvious safe cases to perform tail call optimization.
// If the callee takes no arguments then go on to check the results of the
// call.
@@ -2296,7 +2285,10 @@
return true;
// If the return types match, then it's safe.
+ // Don't tail call optimize recursive call.
+ GlobalAddressSDNode *G = dyn_cast<GlobalAddressSDNode>(Callee);
if (!G) return false; // FIXME: common external symbols?
+ const Function *CalleeF = cast<Function>(G->getGlobal());
const Type *CalleeRetTy = CalleeF->getReturnType();
return CallerRetTy == CalleeRetTy;
}
diff --git a/test/CodeGen/X86/tailcall2.ll b/test/CodeGen/X86/tailcall2.ll
index e78e213..1e288f5 100644
--- a/test/CodeGen/X86/tailcall2.ll
+++ b/test/CodeGen/X86/tailcall2.ll
@@ -73,7 +73,7 @@
; 32: call {{_?}}bar
; 64: t6:
-; 64: callq {{_?}}t6
+; 64: jmp {{_?}}t6
; 64: jmp {{_?}}bar
%0 = icmp slt i32 %x, 10
br i1 %0, label %bb, label %bb1