Merge commit 'f694f632d9f6' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit 4e212b4b5ff8 · 2024-03-16T16:40:36.000+01:00
diff --git a/libcxx/include/chrono b/libcxx/include/chrono
@@ -883,6 +883,7 @@ constexpr chrono::year                                  operator ""y(unsigned lo
 
 #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER == 20
 #  include <charconv>
+#  include <locale>
 #endif
 
 #endif // _LIBCPP_CHRONO
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20.csv b/libcxx/test/libcxx/transitive_includes/cxx20.csv
@@ -128,6 +128,7 @@ chrono ctime
 chrono cwchar
 chrono forward_list
 chrono limits
+chrono locale
 chrono optional
 chrono ostream
 chrono ratio
