[llvm-branch-commits] [llvm-branch] r121535 - /llvm/branches/Apple/whitney/lib/Target/X86/X86ISelLowering.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Fri Dec 10 15:32:07 2010
New Revision: 121535

URL: http://llvm.org/viewvc/llvm-project?rev=121535&view=rev
Log:
Merge r121340:
--
Author: Eric Christopher <echristo at apple.com>
Date:   Thu Dec 9 00:57:19 2010 +0000

    Stop confusing people, it's not really a chain, or a tumor.

Modified:
    llvm/branches/Apple/whitney/lib/Target/X86/X86ISelLowering.cpp

Modified: llvm/branches/Apple/whitney/lib/Target/X86/X86ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/whitney/lib/Target/X86/X86ISelLowering.cpp?rev=121535&r1=121534&r2=121535&view=diff
==============================================================================
--- llvm/branches/Apple/whitney/lib/Target/X86/X86ISelLowering.cpp (original)
+++ llvm/branches/Apple/whitney/lib/Target/X86/X86ISelLowering.cpp Fri Dec 10 15:32:07 2010
@@ -6199,7 +6199,7 @@
     // Lowering the machine isd will make sure everything is in the right
     // location.
     SDValue Args[] = { Offset };
-    SDValue Chain = DAG.getNode(X86ISD::TLSCALL, DL, MVT::Other, Args, 1);
+    SDValue RetVal = DAG.getNode(X86ISD::TLSCALL, DL, MVT::Other, Args, 1);
 
     // TLSCALL will be codegen'ed as call. Inform MFI that function has calls.
     MachineFrameInfo *MFI = DAG.getMachineFunction().getFrameInfo();
@@ -6207,7 +6207,7 @@
     
     // And our return value (tls address) is in the standard call return value
     // location.
-    return Chain;
+    return RetVal;
   }
 
   assert(false &&