commit 99c075a6fb59fac5b5714a3dac9091b661f5988c
author Arthur O'Dwyer <arthur.j.odwyer@gmail.com> Wed Nov 17 22:26:59 2021 -0500
committer Copybara-Service <copybara-worker@google.com> Thu Nov 18 08:05:52 2021 -0800
tree 67a70ea8fb6a1fe4eccd7e1eebb7b4196ab5894c
parent 7f9c8477e5a76ca93ce0d3465718c738dcdf1f1d

[libc++] Minor fixups in the new introsort code.

Differential Revision: https://reviews.llvm.org/D114133

GitOrigin-RevId: 1ce516d43f105f4ffc36da7627ee51c0c507d1e9

include/__algorithm/sort.h

diff --git a/include/__algorithm/sort.h b/include/__algorithm/sort.h
index 24d0a49..c2f6a62 100644
--- a/include/__algorithm/sort.h
+++ b/include/__algorithm/sort.h
@@ -131,7 +131,7 @@
     _BidirectionalIterator __lm1 = __last;
     for (--__lm1; __first != __lm1; ++__first)
     {
-        _BidirectionalIterator __i = _VSTD::min_element<_BidirectionalIterator, _Compare&>(__first, __last, __comp);
+        _BidirectionalIterator __i = _VSTD::min_element(__first, __last, __comp);
         if (__i != __first)
             swap(*__first, *__i);
     }
@@ -268,13 +268,12 @@
 template <class _Compare, class _RandomAccessIterator>
 void
 __introsort(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp,
-            typename _VSTD::iterator_traits<_RandomAccessIterator>::difference_type __depth)
+            typename iterator_traits<_RandomAccessIterator>::difference_type __depth)
 {
     typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
     typedef typename iterator_traits<_RandomAccessIterator>::value_type value_type;
     const difference_type __limit = is_trivially_copy_constructible<value_type>::value &&
                                     is_trivially_copy_assignable<value_type>::value ? 30 : 6;
-    typedef typename __comp_ref_type<_Compare>::type _Comp_ref;
     while (true)
     {
     __restart:
@@ -307,7 +306,7 @@
         if (__depth == 0)
         {
           // Fallback to heap sort as Introsort suggests.
-          _VSTD::__partial_sort<_Comp_ref>(__first, __last, __last, _Comp_ref(__comp));
+          _VSTD::__partial_sort<_Compare>(__first, __last, __last, __comp);
           return;
         }
         --__depth;
@@ -478,7 +477,7 @@
 void __sort(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp) {
   typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
   difference_type __depth_limit = 2 * __log2i(__last - __first);
-  __introsort(__first, __last, __comp, __depth_limit);
+  _VSTD::__introsort<_Compare>(__first, __last, __comp, __depth_limit);
 }
 
 template <class _Compare, class _Tp>