[libc++] Avoid including <string> in <mutex>

libcxx/include/CMakeLists.txt

@@ -716,6 +716,7 @@ set(files
   __system_error/error_code.h
   __system_error/error_condition.h
   __system_error/system_error.h
+  __system_error/throw_system_error.h
   __thread/formatter.h
   __thread/id.h
   __thread/jthread.h

libcxx/include/__condition_variable/condition_variable.h

@@ -16,7 +16,7 @@
 #include <__config>
 #include <__mutex/mutex.h>
 #include <__mutex/unique_lock.h>
-#include <__system_error/system_error.h>
+#include <__system_error/throw_system_error.h>
 #include <__thread/support.h>
 #include <__type_traits/enable_if.h>
 #include <__type_traits/is_floating_point.h>

libcxx/include/__mutex/unique_lock.h

@@ -14,7 +14,7 @@
 #include <__config>
 #include <__memory/addressof.h>
 #include <__mutex/tag_types.h>
-#include <__system_error/system_error.h>
+#include <__system_error/throw_system_error.h>
 #include <__utility/swap.h>
 #include <cerrno>
 

libcxx/include/__system_error/system_error.h

@@ -39,7 +39,6 @@ class _LIBCPP_EXPORTED_FROM_ABI system_error : public runtime_error {
   _LIBCPP_HIDE_FROM_ABI const error_code& code() const _NOEXCEPT { return __ec_; }
 };
 
-[[__noreturn__]] _LIBCPP_EXPORTED_FROM_ABI void __throw_system_error(int __ev, const char* __what_arg);
 [[__noreturn__]] _LIBCPP_HIDE_FROM_ABI inline void __throw_system_error(error_code __ec, const char* __what_arg) {
 #if _LIBCPP_HAS_EXCEPTIONS
   throw system_error(__ec, __what_arg);

libcxx/include/__system_error/throw_system_error.h

@@ -0,0 +1,25 @@
+// -*- C++ -*-
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef _LIBCPP___SYSTEM_ERROR_THROW_SYSTEM_ERROR_H
+#define _LIBCPP___SYSTEM_ERROR_THROW_SYSTEM_ERROR_H
+
+#include <__config>
+
+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#  pragma GCC system_header
+#endif
+
+_LIBCPP_BEGIN_NAMESPACE_STD
+
+[[__noreturn__]] _LIBCPP_EXPORTED_FROM_ABI void __throw_system_error(int __ev, const char* __what_arg);
+
+_LIBCPP_END_NAMESPACE_STD
+
+#endif // _LIBCPP___SYSTEM_ERROR_THROW_SYSTEM_ERROR_H

libcxx/include/__thread/thread.h

@@ -18,10 +18,13 @@
 #include <__functional/unary_function.h>
 #include <__memory/unique_ptr.h>
 #include <__mutex/mutex.h>
-#include <__system_error/system_error.h>
+#include <__system_error/throw_system_error.h>
 #include <__thread/id.h>
 #include <__thread/support.h>
 #include <__type_traits/decay.h>
+#include <__type_traits/enable_if.h>
+#include <__type_traits/is_same.h>
+#include <__type_traits/remove_cvref.h>
 #include <__utility/forward.h>
 #include <tuple>
 

libcxx/include/module.modulemap

@@ -1921,6 +1921,7 @@ module std [system] {
     }
     module error_condition    { header "__system_error/error_condition.h" }
     module system_error       { header "__system_error/system_error.h" }
+    module throw_system_error { header "__system_error/throw_system_error.h" }
 
     header "system_error"
     export *

libcxx/include/print

@@ -36,7 +36,7 @@ namespace std {
 #include <__assert>
 #include <__concepts/same_as.h>
 #include <__config>
-#include <__system_error/system_error.h>
+#include <__system_error/throw_system_error.h>
 #include <__utility/forward.h>
 #include <cerrno>
 #include <cstdio>

libcxx/include/shared_mutex

@@ -134,7 +134,7 @@ template <class Mutex>
 #  include <__mutex/mutex.h>
 #  include <__mutex/tag_types.h>
 #  include <__mutex/unique_lock.h>
-#  include <__system_error/system_error.h>
+#  include <__system_error/throw_system_error.h>
 #  include <__utility/swap.h>
 #  include <cerrno>
 #  include <version>

libcxx/src/chrono.cpp

@@ -12,7 +12,7 @@
 #  define _LARGE_TIME_API
 #endif
 
-#include <__system_error/system_error.h>
+#include <__system_error/throw_system_error.h>
 #include <cerrno> // errno
 #include <chrono>
 

libcxx/src/filesystem/filesystem_clock.cpp

@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <__config>
+#include <__system_error/throw_system_error.h>
 #include <chrono>
 #include <filesystem>
 #include <time.h>

libcxx/src/random.cpp

@@ -13,7 +13,7 @@
 #  define _CRT_RAND_S
 #endif // defined(_LIBCPP_USING_WIN32_RANDOM)
 
-#include <__system_error/system_error.h>
+#include <__system_error/throw_system_error.h>
 #include <limits>
 #include <random>
 

libcxx/src/system_error.cpp

@@ -8,6 +8,7 @@
 
 #include <__assert>
 #include <__config>
+#include <__system_error/throw_system_error.h>
 #include <__verbose_abort>
 #include <cerrno>
 #include <cstdio>

libcxx/test/libcxx/transitive_includes/cxx23.csv

@@ -199,25 +199,15 @@ complex typeinfo
 complex version
 concepts version
 condition_variable atomic
-condition_variable cctype
 condition_variable cerrno
 condition_variable climits
-condition_variable compare
 condition_variable cstdint
-condition_variable cstdio
 condition_variable cstring
 condition_variable ctime
-condition_variable cwchar
-condition_variable cwctype
 condition_variable initializer_list
-condition_variable iosfwd
 condition_variable limits
 condition_variable new
 condition_variable ratio
-condition_variable stdexcept
-condition_variable string
-condition_variable string_view
-condition_variable tuple
 condition_variable typeinfo
 condition_variable version
 coroutine compare
@@ -709,46 +699,25 @@ memory new
 memory tuple
 memory typeinfo
 memory version
-memory_resource cctype
 memory_resource cerrno
 memory_resource climits
 memory_resource compare
 memory_resource cstdint
-memory_resource cstdio
-memory_resource cstring
 memory_resource ctime
-memory_resource cwchar
-memory_resource cwctype
-memory_resource initializer_list
-memory_resource iosfwd
 memory_resource limits
 memory_resource mutex
 memory_resource new
 memory_resource ratio
-memory_resource stdexcept
-memory_resource string
-memory_resource string_view
 memory_resource tuple
 memory_resource typeinfo
 memory_resource version
-mutex cctype
 mutex cerrno
 mutex climits
 mutex compare
 mutex cstdint
-mutex cstdio
-mutex cstring
 mutex ctime
-mutex cwchar
-mutex cwctype
-mutex initializer_list
-mutex iosfwd
 mutex limits
-mutex new
 mutex ratio
-mutex stdexcept
-mutex string
-mutex string_view
 mutex tuple
 mutex typeinfo
 mutex version
@@ -951,25 +920,12 @@ set new
 set optional
 set tuple
 set version
-shared_mutex cctype
 shared_mutex cerrno
 shared_mutex climits
-shared_mutex compare
 shared_mutex cstdint
-shared_mutex cstdio
-shared_mutex cstring
 shared_mutex ctime
-shared_mutex cwchar
-shared_mutex cwctype
-shared_mutex initializer_list
-shared_mutex iosfwd
 shared_mutex limits
-shared_mutex new
 shared_mutex ratio
-shared_mutex stdexcept
-shared_mutex string
-shared_mutex string_view
-shared_mutex tuple
 shared_mutex version
 source_location cstdint
 source_location version

libcxx/test/libcxx/transitive_includes/cxx26.csv

@@ -199,25 +199,15 @@ complex typeinfo
 complex version
 concepts version
 condition_variable atomic
-condition_variable cctype
 condition_variable cerrno
 condition_variable climits
-condition_variable compare
 condition_variable cstdint
-condition_variable cstdio
 condition_variable cstring
 condition_variable ctime
-condition_variable cwchar
-condition_variable cwctype
 condition_variable initializer_list
-condition_variable iosfwd
 condition_variable limits
 condition_variable new
 condition_variable ratio
-condition_variable stdexcept
-condition_variable string
-condition_variable string_view
-condition_variable tuple
 condition_variable typeinfo
 condition_variable version
 coroutine compare
@@ -708,46 +698,25 @@ memory new
 memory tuple
 memory typeinfo
 memory version
-memory_resource cctype
 memory_resource cerrno
 memory_resource climits
 memory_resource compare
 memory_resource cstdint
-memory_resource cstdio
-memory_resource cstring
 memory_resource ctime
-memory_resource cwchar
-memory_resource cwctype
-memory_resource initializer_list
-memory_resource iosfwd
 memory_resource limits
 memory_resource mutex
 memory_resource new
 memory_resource ratio
-memory_resource stdexcept
-memory_resource string
-memory_resource string_view
 memory_resource tuple
 memory_resource typeinfo
 memory_resource version
-mutex cctype
 mutex cerrno
 mutex climits
 mutex compare
 mutex cstdint
-mutex cstdio
-mutex cstring
 mutex ctime
-mutex cwchar
-mutex cwctype
-mutex initializer_list
-mutex iosfwd
 mutex limits
-mutex new
 mutex ratio
-mutex stdexcept
-mutex string
-mutex string_view
 mutex tuple
 mutex typeinfo
 mutex version
@@ -950,25 +919,12 @@ set new
 set optional
 set tuple
 set version
-shared_mutex cctype
 shared_mutex cerrno
 shared_mutex climits
-shared_mutex compare
 shared_mutex cstdint
-shared_mutex cstdio
-shared_mutex cstring
 shared_mutex ctime
-shared_mutex cwchar
-shared_mutex cwctype
-shared_mutex initializer_list
-shared_mutex iosfwd
 shared_mutex limits
-shared_mutex new
 shared_mutex ratio
-shared_mutex stdexcept
-shared_mutex string
-shared_mutex string_view
-shared_mutex tuple
 shared_mutex version
 source_location cstdint
 source_location version