[llvm-commits] CVS: llvm/lib/Target/X86/X86ISelLowering.cpp

[Chris Lattner]

Changes in directory llvm/lib/Target/X86:

X86ISelLowering.cpp updated: 1.204 -> 1.205
---
Log message:

Implement the custom lowering hook right, returning values for all of the
arguments at once.


---
Diffs of the changes:  (+5 -1)

 X86ISelLowering.cpp |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)


Index: llvm/lib/Target/X86/X86ISelLowering.cpp
diff -u llvm/lib/Target/X86/X86ISelLowering.cpp:1.204 llvm/lib/Target/X86/X86ISelLowering.cpp:1.205
--- llvm/lib/Target/X86/X86ISelLowering.cpp:1.204	Tue May 16 12:08:35 2006
+++ llvm/lib/Target/X86/X86ISelLowering.cpp	Tue May 16 12:14:26 2006
@@ -3519,7 +3519,11 @@
     else
       LowerCCCArguments(Op, DAG);
   }
-  return FormalArgs[Op.ResNo];
+  
+  // Return the new list of results.
+  std::vector<MVT::ValueType> RetVTs(Op.Val->value_begin(),
+                                     Op.Val->value_end());
+  return DAG.getNode(ISD::MERGE_VALUES, RetVTs, FormalArgs);
 }
 
 SDOperand X86TargetLowering::LowerMEMSET(SDOperand Op, SelectionDAG &DAG) {