[libcxx-commits] [libcxx] 618ce78 - [libc++][NFC] Simplify scoped_lock::__unlock_unpack a bit (#85517)

[via libcxx-commits]

Author: Nikolas Klauser
Date: 2024-03-16T16:37:35+01:00
New Revision: 618ce78603241cda3483da0532ef92254bd748cb

URL: https://github.com/llvm/llvm-project/commit/618ce78603241cda3483da0532ef92254bd748cb
DIFF: https://github.com/llvm/llvm-project/commit/618ce78603241cda3483da0532ef92254bd748cb.diff

LOG: [libc++][NFC] Simplify scoped_lock::__unlock_unpack a bit (#85517)

Added: 
    

Modified: 
    libcxx/include/mutex

Removed: 
    


################################################################################
diff  --git a/libcxx/include/mutex b/libcxx/include/mutex
index ea56e3051908a7..12fae9a88b9d7e 100644
--- a/libcxx/include/mutex
+++ b/libcxx/include/mutex
@@ -418,24 +418,6 @@ inline _LIBCPP_HIDE_FROM_ABI void lock(_L0& __l0, _L1& __l1, _L2& __l2, _L3&...
   std::__lock_first(0, __l0, __l1, __l2, __l3...);
 }
 
-template <class _L0>
-inline _LIBCPP_HIDE_FROM_ABI void __unlock(_L0& __l0) {
-  __l0.unlock();
-}
-
-template <class _L0, class _L1>
-inline _LIBCPP_HIDE_FROM_ABI void __unlock(_L0& __l0, _L1& __l1) {
-  __l0.unlock();
-  __l1.unlock();
-}
-
-template <class _L0, class _L1, class _L2, class... _L3>
-inline _LIBCPP_HIDE_FROM_ABI void __unlock(_L0& __l0, _L1& __l1, _L2& __l2, _L3&... __l3) {
-  __l0.unlock();
-  __l1.unlock();
-  std::__unlock(__l2, __l3...);
-}
-
 #  endif // _LIBCPP_CXX03_LANG
 
 #  if _LIBCPP_STD_VER >= 17
@@ -498,7 +480,7 @@ public:
 private:
   template <size_t... _Indx>
   _LIBCPP_HIDE_FROM_ABI static void __unlock_unpack(__tuple_indices<_Indx...>, _MutexTuple& __mt) {
-    std::__unlock(std::get<_Indx>(__mt)...);
+    (std::get<_Indx>(__mt).unlock(), ...);
   }
 
   _MutexTuple __t_;