diff options
Diffstat (limited to 'llvm/lib/CodeGen')
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp index 3c2ca50a10f..f49e22b8288 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp @@ -9350,12 +9350,10 @@ bool SelectionDAGBuilder::buildBitTests(CaseClusterVector &Clusters, BitTestInfo BTI; std::sort(CBV.begin(), CBV.end(), [](const CaseBits &a, const CaseBits &b) { - // Sort by probability first, number of bits second, bit mask third. + // Sort by probability first, number of bits second. if (a.ExtraProb != b.ExtraProb) return a.ExtraProb > b.ExtraProb; - if (a.Bits != b.Bits) - return a.Bits > b.Bits; - return a.Mask < b.Mask; + return a.Bits > b.Bits; }); for (auto &CB : CBV) { @@ -9544,13 +9542,10 @@ void SelectionDAGBuilder::lowerWorkItem(SwitchWorkListItem W, Value *Cond, } if (TM.getOptLevel() != CodeGenOpt::None) { - // Here, we order cases by probability so the most likely case will be - // checked first. However, two clusters can have the same probability in - // which case their relative ordering is non-deterministic. So we use Low - // as a tie-breaker as clusters are guaranteed to never overlap. + // Order cases by probability so the most likely case will be checked first. std::sort(W.FirstCluster, W.LastCluster + 1, [](const CaseCluster &a, const CaseCluster &b) { - return a.Prob != b.Prob ? a.Prob > b.Prob : a.Low < b.Low; + return a.Prob > b.Prob; }); // Rearrange the case blocks so that the last one falls through if possible |
