diff options
| -rw-r--r-- | lib/Target/X86/X86ISelDAGToDAG.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/Target/X86/X86ISelDAGToDAG.cpp b/lib/Target/X86/X86ISelDAGToDAG.cpp index 6c32308e07..03f56ebdcd 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) |