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 | 3d960941b1feecb94c19c232ad992b32ac1bc864 (patch) | |
| tree | 83c375467df8179cdf824102583d54a6b750f29c /llvm/lib/Target/ARM/ARMISelLowering.cpp | |
| parent | 6ed40141f7e3ea38589b67fd15ac48b93c1c8fa1 (diff) | |
| download | bcm5719-llvm-3d960941b1feecb94c19c232ad992b32ac1bc864.tar.gz bcm5719-llvm-3d960941b1feecb94c19c232ad992b32ac1bc864.zip | |
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.
llvm-svn: 60349
Diffstat (limited to 'llvm/lib/Target/ARM/ARMISelLowering.cpp')
| -rw-r--r-- | llvm/lib/Target/ARM/ARMISelLowering.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Target/ARM/ARMISelLowering.cpp b/llvm/lib/Target/ARM/ARMISelLowering.cpp index 1f6294f03c3..69452c13601 100644 --- a/llvm/lib/Target/ARM/ARMISelLowering.cpp +++ b/llvm/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. |
