diff options
author | Bill Wendling <isanbard@gmail.com> | 2010-01-06 00:23:35 +0000 |
---|---|---|
committer | Bill Wendling <isanbard@gmail.com> | 2010-01-06 00:23:35 +0000 |
commit | 3f09487404bc46297dc6fd91ca3ac478c3a7fa34 (patch) | |
tree | 8bd7bd42effd493d74c1835fc8078613ce328716 | |
parent | cfeea4b92aa5be102e58efea947ca40a95b0c999 (diff) |
The previous code could potentially cause a cycle. Allow ordering w.r.t. a 0 order.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@92810 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp b/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp index 4d51f0c13e..1ad7919962 100644 --- a/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp +++ b/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp @@ -1129,8 +1129,8 @@ bool bu_ls_rr_sort::operator()(const SUnit *left, const SUnit *right) const { // Prefer an ordering where the lower the non-zero order number, the higher // the preference. - if (LOrder && ROrder && LOrder != ROrder) - return LOrder < ROrder; + if ((LOrder || ROrder) && LOrder != ROrder) + return LOrder != 0 && (LOrder < ROrder || ROrder == 0); unsigned LPriority = SPQ->getNodePriority(left); unsigned RPriority = SPQ->getNodePriority(right); |