[PATCH] D134805: [ADT] IntervalTree - Random unittests failures in a debug build
Carlos Alberto Enciso via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Wed Sep 28 21:20:30 PDT 2022
This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rGb55e76de8bcf: [ADT] IntervalTree - Fix random unittests failures in a debug builds. (authored by CarlosAlbertoEnciso).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D134805/new/
https://reviews.llvm.org/D134805
Files:
llvm/include/llvm/ADT/IntervalTree.h
Index: llvm/include/llvm/ADT/IntervalTree.h
===================================================================
--- llvm/include/llvm/ADT/IntervalTree.h
+++ llvm/include/llvm/ADT/IntervalTree.h
@@ -421,17 +421,17 @@
// Sort intervals on the left and right of the middle point.
if (NewBucketSize > 1) {
// Sort the intervals in ascending order by their beginning point.
- std::sort(IntervalsLeft.begin() + NewBucketStart,
- IntervalsLeft.begin() + NewBucketStart + NewBucketSize,
- [](const DataType *LHS, const DataType *RHS) {
- return LHS->left() < RHS->left();
- });
+ std::stable_sort(IntervalsLeft.begin() + NewBucketStart,
+ IntervalsLeft.begin() + NewBucketStart + NewBucketSize,
+ [](const DataType *LHS, const DataType *RHS) {
+ return LHS->left() < RHS->left();
+ });
// Sort the intervals in descending order by their ending point.
- std::sort(IntervalsRight.begin() + NewBucketStart,
- IntervalsRight.begin() + NewBucketStart + NewBucketSize,
- [](const DataType *LHS, const DataType *RHS) {
- return LHS->right() > RHS->right();
- });
+ std::stable_sort(IntervalsRight.begin() + NewBucketStart,
+ IntervalsRight.begin() + NewBucketStart + NewBucketSize,
+ [](const DataType *LHS, const DataType *RHS) {
+ return LHS->right() > RHS->right();
+ });
}
if (PointsBeginIndex <= MiddleIndex - 1) {
@@ -626,14 +626,14 @@
/// Ascending: return the intervals with the smallest at the front.
/// Descending: return the intervals with the biggest at the front.
static void sortIntervals(IntervalReferences &IntervalSet, Sorting Sort) {
- std::sort(IntervalSet.begin(), IntervalSet.end(),
- [Sort](const DataType *RHS, const DataType *LHS) {
- return Sort == Sorting::Ascending
- ? (LHS->right() - LHS->left()) >
- (RHS->right() - RHS->left())
- : (LHS->right() - LHS->left()) <
- (RHS->right() - RHS->left());
- });
+ std::stable_sort(IntervalSet.begin(), IntervalSet.end(),
+ [Sort](const DataType *RHS, const DataType *LHS) {
+ return Sort == Sorting::Ascending
+ ? (LHS->right() - LHS->left()) >
+ (RHS->right() - RHS->left())
+ : (LHS->right() - LHS->left()) <
+ (RHS->right() - RHS->left());
+ });
}
/// Print the interval tree.
@@ -654,7 +654,7 @@
Points.push_back(Data.right());
References.push_back(std::addressof(Data));
}
- std::sort(Points.begin(), Points.end());
+ std::stable_sort(Points.begin(), Points.end());
auto Last = std::unique(Points.begin(), Points.end());
Points.erase(Last, Points.end());
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D134805.463757.patch
Type: text/x-patch
Size: 3199 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220929/79da55a3/attachment.bin>
More information about the llvm-commits
mailing list