[libc++] fix std::sort(T**, T**)
previously, invocations of std::sort(T**, T**) casted the arguments to
(size_t *). this breaks sorting on systems for which pointers don't fit
in a size_t. change the cast to (uintptr_t *) and add a test.
Differential Revision: https://reviews.llvm.org/D92190
GitOrigin-RevId: 297c839e2d22f9bc37f5f8cca7eb5924b49716d2
diff --git a/include/algorithm b/include/algorithm
index 970d36c..2a854e7 100644
--- a/include/algorithm
+++ b/include/algorithm
@@ -4162,7 +4162,7 @@
void
sort(_Tp** __first, _Tp** __last)
{
- _VSTD::sort((size_t*)__first, (size_t*)__last, __less<size_t>());
+ _VSTD::sort((uintptr_t*)__first, (uintptr_t*)__last, __less<uintptr_t>());
}
template <class _Tp>
diff --git a/test/std/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp b/test/std/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp
index 1adba43..3058b64 100644
--- a/test/std/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp
+++ b/test/std/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp
@@ -132,6 +132,21 @@
test_larger_sorts(N, N);
}
+void
+test_pointer_sort()
+{
+ static const int array_size = 10;
+ const int v[array_size] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+ const int *pv[array_size];
+ for (int i = 0; i < array_size; i++) {
+ pv[i] = &v[array_size - 1 - i];
+ }
+ std::sort(pv, pv + array_size);
+ assert(*pv[0] == v[0]);
+ assert(*pv[1] == v[1]);
+ assert(*pv[array_size - 1] == v[array_size - 1]);
+}
+
int main(int, char**)
{
// test null range
@@ -155,5 +170,7 @@
test_larger_sorts(1000);
test_larger_sorts(1009);
+ test_pointer_sort();
+
return 0;
}