From: Chris Lattner <sabre@nondot.org>
Date: Sat, 24 Nov 2007 19:12:15 +0000 (+0000)
Subject: Implement expand support for MERGE_VALUEs that only produces one result.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c58d558a79c3638c23d8fd09d89accff33285653;p=oota-llvm.git

Implement expand support for MERGE_VALUEs that only produces one result.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@44304 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
index aa8ffaae071..30b55156c26 100644
--- a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
@@ -5401,6 +5401,10 @@ void SelectionDAGLegalize::ExpandOp(SDOperand Op, SDOperand &Lo, SDOperand &Hi){
     break;
       
   case ISD::MERGE_VALUES:
+    if (Node->getNumValues() == 1) {
+      ExpandOp(Op.getOperand(0), Lo, Hi);
+      break;
+    }
     // FIXME: For now only expand i64,chain = MERGE_VALUES (x, y)
     assert(Op.ResNo == 0 && Node->getNumValues() == 2 &&
            Op.getValue(1).getValueType() == MVT::Other &&