[llvm-branch-commits] [llvm-branch] r98271 - in /llvm/branches/Apple/Hermes: ./ lib/Target/X86/X86ISelLowering.cpp test/CodeGen/X86/tailcallfp2.ll

[Evan Cheng]

Author: evancheng
Date: Thu Mar 11 12:57:03 2010
New Revision: 98271

URL: http://llvm.org/viewvc/llvm-project?rev=98271&view=rev
Log:
Merge 98270.

Modified:
    llvm/branches/Apple/Hermes/   (props changed)
    llvm/branches/Apple/Hermes/lib/Target/X86/X86ISelLowering.cpp
    llvm/branches/Apple/Hermes/test/CodeGen/X86/tailcallfp2.ll

Propchange: llvm/branches/Apple/Hermes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 11 12:57:03 2010
@@ -1 +1 @@
-/llvm/trunk:96521,96525,96572,96621,96775,96825,96827,96990,97025,97065,97071,97538,97707,97757,97782,97797,98210
+/llvm/trunk:96521,96525,96572,96621,96775,96825,96827,96990,97025,97065,97071,97538,97707,97757,97782,97797,98210,98270

Modified: llvm/branches/Apple/Hermes/lib/Target/X86/X86ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Hermes/lib/Target/X86/X86ISelLowering.cpp?rev=98271&r1=98270&r2=98271&view=diff
==============================================================================
--- llvm/branches/Apple/Hermes/lib/Target/X86/X86ISelLowering.cpp (original)
+++ llvm/branches/Apple/Hermes/lib/Target/X86/X86ISelLowering.cpp Thu Mar 11 12:57:03 2010
@@ -2089,7 +2089,7 @@
     // tailcall must happen after callee-saved registers are poped.
     // FIXME: Give it a special register class that contains caller-saved
     // register instead?
-    unsigned TCReg = Is64Bit ? X86::R11 : X86::EAX;
+    unsigned TCReg = Is64Bit ? X86::R11 : X86::ECX;
     Chain = DAG.getCopyToReg(Chain,  dl,
                              DAG.getRegister(TCReg, getPointerTy()),
                              Callee,InFlag);
@@ -2143,7 +2143,7 @@
     }
 
     assert(((Callee.getOpcode() == ISD::Register &&
-               (cast<RegisterSDNode>(Callee)->getReg() == X86::EAX ||
+               (cast<RegisterSDNode>(Callee)->getReg() == X86::ECX ||
                 cast<RegisterSDNode>(Callee)->getReg() == X86::R11)) ||
               Callee.getOpcode() == ISD::TargetExternalSymbol ||
               Callee.getOpcode() == ISD::TargetGlobalAddress) &&

Modified: llvm/branches/Apple/Hermes/test/CodeGen/X86/tailcallfp2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Hermes/test/CodeGen/X86/tailcallfp2.ll?rev=98271&r1=98270&r2=98271&view=diff
==============================================================================
--- llvm/branches/Apple/Hermes/test/CodeGen/X86/tailcallfp2.ll (original)
+++ llvm/branches/Apple/Hermes/test/CodeGen/X86/tailcallfp2.ll Thu Mar 11 12:57:03 2010
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 -tailcallopt | grep {jmp} | grep {\\*%eax}
+; RUN: llc < %s -march=x86 -tailcallopt | grep {jmp} | grep {\\*%ecx}
 
 declare i32 @putchar(i32)