From cf34770b282e08e251811f0cd1af7e6e25bf0ead Mon Sep 17 00:00:00 2001
From: Evan Cheng <evan.cheng@apple.com>
Date: Mon, 12 Dec 2005 20:32:18 +0000
Subject: [PATCH] For ISD::RET, if # of operands >= 2, try selection the real
 data dep. operand first before the chain. e.g. int X;

int foo(int x)
{
  x += X + 37;
  return x;
}

If chain operand is selected first, we would generate:
	movl X, %eax
	movl 4(%esp), %ecx
	leal 37(%ecx,%eax), %eax

rather than
	movl $37, %eax
	addl 4(%esp), %eax
	addl X, %eax

which does not require %ecx. (Due to ADD32rm not matching.)

llvm-svn: 24673
---
 lib/Target/X86/X86ISelDAGToDAG.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/Target/X86/X86ISelDAGToDAG.cpp b/lib/Target/X86/X86ISelDAGToDAG.cpp
index 6c32308e076..03f56ebdcda 100644
--- a/lib/Target/X86/X86ISelDAGToDAG.cpp
+++ b/lib/Target/X86/X86ISelDAGToDAG.cpp
@@ -356,15 +356,22 @@ SDOperand X86DAGToDAGISel::Select(SDOperand Op) {
       break;
 
     case ISD::RET: {
-      SDOperand Chain = Select(N->getOperand(0));     // Token chain.
-      switch (N->getNumOperands()) {
+      SDOperand Chain = N->getOperand(0);     // Token chain.
+      unsigned NumOps = N->getNumOperands();
+
+      // Note: A bit of a hack / optimization... Try to delay chain selection
+      // as much as possible. So it's more likely it has already been selected
+      // for a  real use.
+      switch (NumOps) {
         default:
           assert(0 && "Unknown return instruction!");
         case 3:
+          Chain = Select(Chain);
           assert(0 && "Not yet handled return instruction!");
           break;
         case 2: {
           SDOperand Val = Select(N->getOperand(1));
+          Chain = Select(Chain);
           switch (N->getOperand(1).getValueType()) {
             default:
               assert(0 && "All other types should have been promoted!!");
@@ -378,6 +385,7 @@ SDOperand X86DAGToDAGISel::Select(SDOperand Op) {
           }
         }
         case 1:
+          Chain = Select(Chain);
           break;
       }
       if (X86Lowering.getBytesToPopOnReturn() == 0)