diff options
| author | Duncan Sands <baldrick@free.fr> | 2008-12-01 11:41:29 +0000 |
|---|---|---|
| committer | Duncan Sands <baldrick@free.fr> | 2008-12-01 11:41:29 +0000 |
| commit | aaffa05d0a652dd3eae76a941d02d6b0469fa821 (patch) | |
| tree | 099fbfa40effb61a5ac1273796347c001ce0433b /lib/Target/ARM/ARMISelLowering.cpp | |
| parent | 1607f05cb7d77d01ce521a30232faa389dbed4e2 (diff) | |
There are no longer any places that require a
MERGE_VALUES node with only one operand, so get
rid of special code that only existed to handle
that possibility.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@60349 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/ARM/ARMISelLowering.cpp')
| -rw-r--r-- | lib/Target/ARM/ARMISelLowering.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Target/ARM/ARMISelLowering.cpp b/lib/Target/ARM/ARMISelLowering.cpp index 1f6294f03c..69452c1360 100644 --- a/lib/Target/ARM/ARMISelLowering.cpp +++ b/lib/Target/ARM/ARMISelLowering.cpp @@ -1021,8 +1021,8 @@ ARMTargetLowering::LowerFORMAL_ARGUMENTS(SDValue Op, SelectionDAG &DAG) { ArgValues.push_back(Root); // Return the new list of results. - return DAG.getMergeValues(Op.getNode()->getVTList(), &ArgValues[0], - ArgValues.size()); + return DAG.getNode(ISD::MERGE_VALUES, Op.getNode()->getVTList(), + &ArgValues[0], ArgValues.size()); } /// isFloatingPointZero - Return true if this is +0.0. |