aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2007-11-24 19:12:15 +0000
committerChris Lattner <sabre@nondot.org>2007-11-24 19:12:15 +0000
commit1b66f82d6e76174231832f513f1721cbddf972ca (patch)
tree6406df8486907c2801aef457d73b8a711a0b6d5f
parent8f259c01d3c6253c3c22c7978fccc0b9be8b7ce3 (diff)
downloadexternal_llvm-1b66f82d6e76174231832f513f1721cbddf972ca.zip
external_llvm-1b66f82d6e76174231832f513f1721cbddf972ca.tar.gz
external_llvm-1b66f82d6e76174231832f513f1721cbddf972ca.tar.bz2
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
-rw-r--r--lib/CodeGen/SelectionDAG/LegalizeDAG.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
index aa8ffaa..30b5515 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 &&