commit bcd87b754e26e7f42d8fd4bc83d56888f0afd892
author Chris Lattner <sabre@nondot.org> Thu Jul 09 02:46:53 2009 +0000
committer Chris Lattner <sabre@nondot.org> Thu Jul 09 02:46:53 2009 +0000
tree 53029f8d9cccc2de7f82e1f6e4e5ede50bc2a25a
parent 97220a3da1bb838860f4c4bdd947123418b2df0e

hoist check for IsTailCall to callers.  Eliminate redundant check for 
x86-64: GOT-style PIC is never used on x86-64.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@75090 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Target/X86/X86ISelLowering.cpp

diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp
index a024d10..3889e61 100644
--- a/lib/Target/X86/X86ISelLowering.cpp
+++ b/lib/Target/X86/X86ISelLowering.cpp
@@ -1321,22 +1321,18 @@
 
 /// CallRequiresGOTInRegister - Check whether the call requires the GOT pointer
 /// in a register before calling.
-static bool CallRequiresGOTPtrInReg(const TargetMachine &TM, 
-                                    bool IsTailCall) {
+static bool CallRequiresGOTPtrInReg(const TargetMachine &TM) {
   const X86Subtarget &Subtarget = TM.getSubtarget<X86Subtarget>();
 
-  return !IsTailCall && !Subtarget.is64Bit() &&
-         TM.getRelocationModel() == Reloc::PIC_ &&
+  return TM.getRelocationModel() == Reloc::PIC_ &&
          Subtarget.isPICStyleGOT();
 }
 
 /// CallRequiresFnAddressInReg - Check whether the call requires the function
 /// address to be loaded in a register.
-static bool CallRequiresFnAddressInReg(const TargetMachine &TM, 
-                                       bool IsTailCall) {
+static bool CallRequiresFnAddressInReg(const TargetMachine &TM) {
   const X86Subtarget &Subtarget = TM.getSubtarget<X86Subtarget>();
-  return !Subtarget.is64Bit() && IsTailCall &&
-         TM.getRelocationModel() == Reloc::PIC_ &&
+  return TM.getRelocationModel() == Reloc::PIC_ &&
          Subtarget.isPICStyleGOT();
 }
 
@@ -1808,7 +1804,7 @@
 
   // ELF / PIC requires GOT in the EBX register before function calls via PLT
   // GOT pointer.
-  if (CallRequiresGOTPtrInReg(getTargetMachine(), IsTailCall)) {
+  if (!IsTailCall && CallRequiresGOTPtrInReg(getTargetMachine())) {
     Chain = DAG.getCopyToReg(Chain, dl, X86::EBX,
                              DAG.getNode(X86ISD::GlobalBaseReg,
                                          DebugLoc::getUnknownLoc(),
@@ -1823,7 +1819,7 @@
   // calls on PIC/GOT architectures. Normally we would just put the address of
   // GOT into ebx and then call target@PLT. But for tail calls ebx would be
   // restored (since ebx is callee saved) before jumping to the target@PLT.
-  if (CallRequiresFnAddressInReg(getTargetMachine(), IsTailCall)) {
+  if (IsTailCall && CallRequiresFnAddressInReg(getTargetMachine())) {
     // Note: The actual moving to ecx is done further down.
     GlobalAddressSDNode *G = dyn_cast<GlobalAddressSDNode>(Callee);
     if (G && !G->getGlobal()->hasHiddenVisibility() &&