Merge branch 'master' into devel/sphinx

12 files changed, 368 insertions, 29 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8166bc9..9ff3e3f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,34 @@
+2022-10-15  Jonathan Wakely  <jwakely@redhat.com>
+
+	* src/c++11/debug.cc (print_raw): Move inside #if block.
+
+2022-10-15  Jonathan Wakely  <jwakely@redhat.com>
+
+	* include/bits/charconv.h (__to_chars_10_impl): Add constexpr
+	for C++23. Remove 'static' from array.
+	* include/std/charconv (__cpp_lib_constexpr_charconv): Define.
+	(__to_chars, __to_chars_16): Remove 'static' from array, add
+	constexpr.
+	(__to_chars_10, __to_chars_8, __to_chars_2, __to_chars_i)
+	(to_chars, __raise_and_add, __from_chars_pow2_base)
+	(__from_chars_alnum, from_chars): Add constexpr.
+	(__from_chars_alnum_to_val): Avoid local static during constant
+	evaluation. Add constexpr.
+	* include/std/version (__cpp_lib_constexpr_charconv): Define.
+	* testsuite/20_util/from_chars/constexpr.cc: New test.
+	* testsuite/20_util/to_chars/constexpr.cc: New test.
+	* testsuite/20_util/to_chars/version.cc: New test.
+
+2022-10-15  Jonathan Wakely  <jwakely@redhat.com>
+
+	* include/bits/stl_map.h (map::insert(Pair&&)): Use
+	remove_const_t on argument to __is_pair.
+	* include/bits/stl_pair.h (__is_pair<const pair<T,U>>): Remove
+	partial specialization.
+	* include/bits/uses_allocator_args.h (_Std_pair): Use
+	remove_cv_t as per LWG 3677.
+	* testsuite/20_util/uses_allocator/lwg3677.cc: New test.
+
 2022-10-14  Jonathan Wakely  <jwakely@redhat.com>
 
 	* libsupc++/eh_alloc.cc [USE_POOL]: New macro.
diff --git a/libstdc++-v3/include/bits/charconv.h b/libstdc++-v3/include/bits/charconv.h
index 4cae10a..d04aab7 100644
--- a/libstdc++-v3/include/bits/charconv.h
+++ b/libstdc++-v3/include/bits/charconv.h
@@ -68,13 +68,13 @@ namespace __detail
   // The caller is required to provide a buffer of exactly the right size
   // (which can be determined by the __to_chars_len function).
   template<typename _Tp>
-    void
+    _GLIBCXX23_CONSTEXPR void
     __to_chars_10_impl(char* __first, unsigned __len, _Tp __val) noexcept
     {
       static_assert(is_integral<_Tp>::value, "implementation bug");
       static_assert(is_unsigned<_Tp>::value, "implementation bug");
 
-      static constexpr char __digits[201] =
+      constexpr char __digits[201] =
 	"0001020304050607080910111213141516171819"
 	"2021222324252627282930313233343536373839"
 	"4041424344454647484950515253545556575859"
diff --git a/libstdc++-v3/include/bits/stl_map.h b/libstdc++-v3/include/bits/stl_map.h
index 9c2b074..83c579a 100644
--- a/libstdc++-v3/include/bits/stl_map.h
+++ b/libstdc++-v3/include/bits/stl_map.h
@@ -847,7 +847,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
 	{
 #if __cplusplus >= 201703L
 	  using _P2 = remove_reference_t<_Pair>;
-	  if constexpr (__is_pair<_P2>)
+	  if constexpr (__is_pair<remove_const_t<_P2>>)
 	    if constexpr (is_same_v<allocator_type, allocator<value_type>>)
 	      if constexpr (__usable_key<typename _P2::first_type>)
 		{
diff --git a/libstdc++-v3/include/bits/stl_pair.h b/libstdc++-v3/include/bits/stl_pair.h
index d0f07b0..1951670 100644
--- a/libstdc++-v3/include/bits/stl_pair.h
+++ b/libstdc++-v3/include/bits/stl_pair.h
@@ -889,9 +889,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   template<typename _Tp, typename _Up>
     inline constexpr bool __is_pair<pair<_Tp, _Up>> = true;
-
-  template<typename _Tp, typename _Up>
-    inline constexpr bool __is_pair<const pair<_Tp, _Up>> = true;
 #endif
 
   /// @cond undocumented
diff --git a/libstdc++-v3/include/bits/uses_allocator_args.h b/libstdc++-v3/include/bits/uses_allocator_args.h
index ef5c4ff..77e4860 100644
--- a/libstdc++-v3/include/bits/uses_allocator_args.h
+++ b/libstdc++-v3/include/bits/uses_allocator_args.h
@@ -44,7 +44,7 @@ namespace std _GLIBCXX_VISIBILITY(default)
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   template<typename _Tp>
-    concept _Std_pair = __is_pair<_Tp>;
+    concept _Std_pair = __is_pair<remove_cv_t<_Tp>>;
 
 /** @addtogroup allocators
  *  @{
diff --git a/libstdc++-v3/include/std/charconv b/libstdc++-v3/include/std/charconv
index 64d0584..4b6cc83 100644
--- a/libstdc++-v3/include/std/charconv
+++ b/libstdc++-v3/include/std/charconv
@@ -50,6 +50,10 @@
 # define __cpp_lib_to_chars 201611L
 #endif
 
+#if __cplusplus > 202002L
+# define __cpp_lib_constexpr_charconv 202202L
+#endif
+
 namespace std _GLIBCXX_VISIBILITY(default)
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
@@ -119,7 +123,7 @@ namespace __detail
 
   // Generic implementation for arbitrary bases.
   template<typename _Tp>
-    to_chars_result
+    constexpr to_chars_result
     __to_chars(char* __first, char* __last, _Tp __val, int __base) noexcept
     {
       static_assert(is_integral<_Tp>::value, "implementation bug");
@@ -138,7 +142,7 @@ namespace __detail
 
       unsigned __pos = __len - 1;
 
-      static constexpr char __digits[] = {
+      constexpr char __digits[] = {
 	'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
 	'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
 	'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't',
@@ -160,7 +164,7 @@ namespace __detail
     }
 
   template<typename _Tp>
-    __integer_to_chars_result_type<_Tp>
+    constexpr __integer_to_chars_result_type<_Tp>
     __to_chars_16(char* __first, char* __last, _Tp __val) noexcept
     {
       static_assert(is_integral<_Tp>::value, "implementation bug");
@@ -177,7 +181,7 @@ namespace __detail
 	  return __res;
 	}
 
-      static constexpr char __digits[] = {
+      constexpr char __digits[] = {
 	'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
 	'a', 'b', 'c', 'd', 'e', 'f'
       };
@@ -207,7 +211,7 @@ namespace __detail
     }
 
   template<typename _Tp>
-    inline __integer_to_chars_result_type<_Tp>
+    constexpr __integer_to_chars_result_type<_Tp>
     __to_chars_10(char* __first, char* __last, _Tp __val) noexcept
     {
       static_assert(is_integral<_Tp>::value, "implementation bug");
@@ -231,7 +235,7 @@ namespace __detail
     }
 
   template<typename _Tp>
-    __integer_to_chars_result_type<_Tp>
+    constexpr __integer_to_chars_result_type<_Tp>
     __to_chars_8(char* __first, char* __last, _Tp __val) noexcept
     {
       static_assert(is_integral<_Tp>::value, "implementation bug");
@@ -285,7 +289,7 @@ namespace __detail
     }
 
   template<typename _Tp>
-    __integer_to_chars_result_type<_Tp>
+    constexpr __integer_to_chars_result_type<_Tp>
     __to_chars_2(char* __first, char* __last, _Tp __val) noexcept
     {
       static_assert(is_integral<_Tp>::value, "implementation bug");
@@ -322,7 +326,7 @@ namespace __detail
 } // namespace __detail
 
   template<typename _Tp>
-    __detail::__integer_to_chars_result_type<_Tp>
+    constexpr __detail::__integer_to_chars_result_type<_Tp>
     __to_chars_i(char* __first, char* __last, _Tp __value, int __base = 10)
     {
       __glibcxx_assert(2 <= __base && __base <= 36);
@@ -361,7 +365,7 @@ namespace __detail
     }
 
 #define _GLIBCXX_TO_CHARS(T) \
-  inline to_chars_result \
+  _GLIBCXX23_CONSTEXPR inline to_chars_result \
   to_chars(char* __first, char* __last, T __value, int __base = 10) \
   { return std::__to_chars_i<T>(__first, __last, __value, __base); }
 _GLIBCXX_TO_CHARS(char)
@@ -400,7 +404,7 @@ _GLIBCXX_TO_CHARS(unsigned __GLIBCXX_TYPE_INT_N_3)
 namespace __detail
 {
   template<typename _Tp>
-    bool
+    constexpr bool
     __raise_and_add(_Tp& __val, int __base, unsigned char __c)
     {
       if (__builtin_mul_overflow(__val, __base, &__val)
@@ -429,18 +433,27 @@ namespace __detail
     return __table;
   }
 
+#if __cpp_lib_constexpr_charconv
+  template<bool _DecOnly>
+    inline constexpr auto __table = __from_chars_alnum_to_val_table();
+#endif
+
   // If _DecOnly is true: if the character is a decimal digit, then
   // return its corresponding base-10 value, otherwise return a value >= 127.
   // If _DecOnly is false: if the character is an alphanumeric digit, then
   // return its corresponding base-36 value, otherwise return a value >= 127.
   template<bool _DecOnly = false>
-    unsigned char
+    _GLIBCXX23_CONSTEXPR unsigned char
     __from_chars_alnum_to_val(unsigned char __c)
     {
       if _GLIBCXX17_CONSTEXPR (_DecOnly)
 	return static_cast<unsigned char>(__c - '0');
       else
 	{
+#if __cpp_lib_constexpr_charconv
+	  if (std::__is_constant_evaluated())
+	    return __table<_DecOnly>.__data[__c];
+#endif
 	  // This initializer is deliberately made dependent in order to work
 	  // around modules bug PR105322.
 	  static constexpr auto __table = (_DecOnly, __from_chars_alnum_to_val_table());
@@ -451,7 +464,7 @@ namespace __detail
   /// std::from_chars implementation for integers in a power-of-two base.
   /// If _DecOnly is true, then we may assume __base is at most 8.
   template<bool _DecOnly, typename _Tp>
-    bool
+    _GLIBCXX23_CONSTEXPR bool
     __from_chars_pow2_base(const char*& __first, const char* __last, _Tp& __val,
 			   int __base)
     {
@@ -508,7 +521,7 @@ namespace __detail
   /// std::from_chars implementation for integers in any base.
   /// If _DecOnly is true, then we may assume __base is at most 10.
   template<bool _DecOnly, typename _Tp>
-    bool
+    constexpr bool
     __from_chars_alnum(const char*& __first, const char* __last, _Tp& __val,
 		       int __base)
     {
@@ -548,7 +561,7 @@ namespace __detail
 
   /// std::from_chars for integral types.
   template<typename _Tp>
-    __detail::__integer_from_chars_result_type<_Tp>
+    _GLIBCXX23_CONSTEXPR __detail::__integer_from_chars_result_type<_Tp>
     from_chars(const char* __first, const char* __last, _Tp& __value,
 	       int __base = 10)
     {
diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version
index 397a4aa..bec9e7a 100644
--- a/libstdc++-v3/include/std/version
+++ b/libstdc++-v3/include/std/version
@@ -302,6 +302,7 @@
 #if __cplusplus > 202002L
 // c++23
 #define __cpp_lib_byteswap 202110L
+#define __cpp_lib_constexpr_charconv 202202L
 #define __cpp_lib_constexpr_typeinfo 202106L
 #if __cpp_concepts >= 202002L
 # define __cpp_lib_expected 202202L
diff --git a/libstdc++-v3/src/c++11/debug.cc b/libstdc++-v3/src/c++11/debug.cc
index f2b25fb..9eda380 100644
--- a/libstdc++-v3/src/c++11/debug.cc
+++ b/libstdc++-v3/src/c++11/debug.cc
@@ -610,14 +610,6 @@ namespace
     { print_word(ctx, word, Length - 1); }
 
   void
-  print_raw(PrintContext& ctx, const char* str, ptrdiff_t nbc)
-  {
-    if (nbc == -1)
-      nbc = INT_MAX;
-    ctx._M_column += fprintf(stderr, "%.*s", (int)nbc, str);
-  }
-
-  void
   print_word(PrintContext& ctx, const char* word, ptrdiff_t nbc = -1)
   {
     size_t length = nbc >= 0 ? nbc : __builtin_strlen(word);
@@ -1092,6 +1084,14 @@ namespace
   { print_string(ctx, str, nbc, nullptr, 0); }
 
 #if _GLIBCXX_HAVE_STACKTRACE
+  void
+  print_raw(PrintContext& ctx, const char* str, ptrdiff_t nbc)
+  {
+    if (nbc == -1)
+      nbc = INT_MAX;
+    ctx._M_column += fprintf(stderr, "%.*s", (int)nbc, str);
+  }
+
   int
   print_backtrace(void* data, __UINTPTR_TYPE__ pc, const char* filename,
 		  int lineno, const char* function)
diff --git a/libstdc++-v3/testsuite/20_util/from_chars/constexpr.cc b/libstdc++-v3/testsuite/20_util/from_chars/constexpr.cc
new file mode 100644
index 0000000..6e14694
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/from_chars/constexpr.cc
@@ -0,0 +1,57 @@
+// { dg-options "-std=gnu++23" }
+// { dg-do compile { target c++23 } }
+
+#include <charconv>
+#include <testsuite_hooks.h>
+
+constexpr bool
+test()
+{
+  const char str[] = "-01234afz###";
+  const char* end = str + sizeof(str);
+
+  std::from_chars_result res;
+  int ival = 99;
+  unsigned uval = 99;
+
+  res = std::from_chars(str, str+1, ival, 10);
+  VERIFY( res.ptr == str );
+  VERIFY( res.ec == std::errc::invalid_argument );
+  VERIFY( ival == 99 );
+  res = std::from_chars(str, str+4, ival, 10);
+  VERIFY( res.ptr == str+4 );
+  VERIFY( res.ec == std::errc{} );
+  VERIFY( ival == -12 );
+  res = std::from_chars(str, end, ival, 10);
+  VERIFY( res.ptr == str+6 );
+  VERIFY( res.ec == std::errc{} );
+  VERIFY( ival == -1234 );
+
+  res = std::from_chars(str, end, uval, 10);
+  VERIFY( res.ptr == str );
+  VERIFY( res.ec == std::errc::invalid_argument );
+  VERIFY( uval == 99 );
+  res = std::from_chars(str+1, end, uval, 10);
+  VERIFY( res.ptr == str+6 );
+  VERIFY( res.ec == std::errc{} );
+  VERIFY( uval == 1234 );
+
+  res = std::from_chars(str, end, ival, 3);
+  VERIFY( res.ptr == str+4 );
+  VERIFY( res.ec == std::errc{} );
+  VERIFY( ival == -5 );
+
+  res = std::from_chars(str, end, ival, 16);
+  VERIFY( res.ptr == str+8 );
+  VERIFY( res.ec == std::errc{} );
+  VERIFY( ival == -1193135 );
+
+  res = std::from_chars(str+1, end, uval, 36);
+  VERIFY( res.ptr == str+1+8 );
+  VERIFY( res.ec == std::errc{} );
+  VERIFY( uval == 2302953695 );
+
+  return true;
+}
+
+static_assert( test() );
diff --git a/libstdc++-v3/testsuite/20_util/to_chars/constexpr.cc b/libstdc++-v3/testsuite/20_util/to_chars/constexpr.cc
new file mode 100644
index 0000000..30c5916
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/to_chars/constexpr.cc
@@ -0,0 +1,172 @@
+// { dg-options "-std=gnu++23" }
+// { dg-do compile { target c++23 } }
+
+#include <charconv>
+
+#ifndef __cpp_lib_constexpr_charconv
+# error "Feature-test macro for constexpr charconv missing in <charconv>"
+#elif __cpp_lib_constexpr_charconv != 202202L
+# error "Feature-test macro for constexpr charconv has wrong value in <charconv>"
+#endif
+
+#include <testsuite_hooks.h>
+
+constexpr bool
+test_base10()
+{
+  std::to_chars_result res;
+  char buf[10] = "XXXXXXXXX";
+  res = std::to_chars(buf, buf+3, 1234);
+  VERIFY( res.ptr == buf+3 );
+  VERIFY( res.ec == std::errc::value_too_large );
+  res = std::to_chars(buf, buf+4, -1234);
+  VERIFY( res.ptr == buf+4 );
+  VERIFY( res.ec == std::errc::value_too_large );
+  res = std::to_chars(buf, buf+4, 1234);
+  VERIFY( res.ptr == buf+4 );
+  VERIFY( res.ec == std::errc{} );
+  VERIFY( buf[0] == '1' );
+  VERIFY( buf[1] == '2' );
+  VERIFY( buf[2] == '3' );
+  VERIFY( buf[3] == '4' );
+  VERIFY( buf[4] == 'X' );
+  res = std::to_chars(buf, buf+10, -567, 10);
+  VERIFY( res.ptr == buf+4 );
+  VERIFY( res.ec == std::errc{} );
+  VERIFY( buf[0] == '-' );
+  VERIFY( buf[1] == '5' );
+  VERIFY( buf[2] == '6' );
+  VERIFY( buf[3] == '7' );
+  VERIFY( buf[4] == 'X' );
+  return true;
+}
+
+static_assert( test_base10() );
+
+constexpr bool
+test_base16()
+{
+  std::to_chars_result res;
+  char buf[10] = "XXXXXXXXX";
+  res = std::to_chars(buf, buf+3, 0x1234, 16);
+  VERIFY( res.ptr == buf+3 );
+  VERIFY( res.ec == std::errc::value_too_large );
+  res = std::to_chars(buf, buf+4, -0x1234, 16);
+  VERIFY( res.ptr == buf+4 );
+  VERIFY( res.ec == std::errc::value_too_large );
+  res = std::to_chars(buf, buf+4, 0x1234, 16);
+  VERIFY( res.ptr == buf+4 );
+  VERIFY( res.ec == std::errc{} );
+  VERIFY( buf[0] == '1' );
+  VERIFY( buf[1] == '2' );
+  VERIFY( buf[2] == '3' );
+  VERIFY( buf[3] == '4' );
+  VERIFY( buf[4] == 'X' );
+  res = std::to_chars(buf, buf+10, -0x567, 16);
+  VERIFY( res.ptr == buf+4 );
+  VERIFY( res.ec == std::errc{} );
+  VERIFY( buf[0] == '-' );
+  VERIFY( buf[1] == '5' );
+  VERIFY( buf[2] == '6' );
+  VERIFY( buf[3] == '7' );
+  VERIFY( buf[5] == 'X' );
+  return true;
+}
+
+static_assert( test_base16() );
+
+constexpr bool
+test_base8()
+{
+  std::to_chars_result res;
+  char buf[10] = "XXXXXXXXX";
+  res = std::to_chars(buf, buf+2, 01234, 8);
+  VERIFY( res.ptr == buf+2 );
+  VERIFY( res.ec == std::errc::value_too_large );
+  res = std::to_chars(buf, buf+3, -01234, 8);
+  VERIFY( res.ptr == buf+3 );
+  VERIFY( res.ec == std::errc::value_too_large );
+  res = std::to_chars(buf, buf+4, 01234, 8);
+  VERIFY( res.ptr == buf+4 );
+  VERIFY( res.ec == std::errc{} );
+  VERIFY( buf[0] == '1' );
+  VERIFY( buf[1] == '2' );
+  VERIFY( buf[2] == '3' );
+  VERIFY( buf[3] == '4' );
+  VERIFY( buf[4] == 'X' );
+  res = std::to_chars(buf, buf+10, -0567, 8);
+  VERIFY( res.ptr == buf+4 );
+  VERIFY( res.ec == std::errc{} );
+  VERIFY( buf[0] == '-' );
+  VERIFY( buf[1] == '5' );
+  VERIFY( buf[2] == '6' );
+  VERIFY( buf[3] == '7' );
+  VERIFY( buf[4] == 'X' );
+  return true;
+}
+
+static_assert( test_base8() );
+
+constexpr bool
+test_base2()
+{
+  std::to_chars_result res;
+  char buf[10] = "XXXXXXXXX";
+  res = std::to_chars(buf, buf+4, 0b10001, 2);
+  VERIFY( res.ptr == buf+4 );
+  VERIFY( res.ec == std::errc::value_too_large );
+  res = std::to_chars(buf, buf+5, -0b10001, 2);
+  VERIFY( res.ptr == buf+5 );
+  VERIFY( res.ec == std::errc::value_too_large );
+  res = std::to_chars(buf, buf+5, 0b10001, 2);
+  VERIFY( res.ptr == buf+5 );
+  VERIFY( res.ec == std::errc{} );
+  VERIFY( buf[0] == '1' );
+  VERIFY( buf[1] == '0' );
+  VERIFY( buf[2] == '0' );
+  VERIFY( buf[3] == '0' );
+  VERIFY( buf[4] == '1' );
+  VERIFY( buf[5] == 'X' );
+  res = std::to_chars(buf, buf+10, -0b11011, 2);
+  VERIFY( res.ptr == buf+6 );
+  VERIFY( res.ec == std::errc{} );
+  VERIFY( buf[0] == '-' );
+  VERIFY( buf[1] == '1' );
+  VERIFY( buf[2] == '1' );
+  VERIFY( buf[3] == '0' );
+  VERIFY( buf[4] == '1' );
+  VERIFY( buf[5] == '1' );
+  VERIFY( buf[6] == 'X' );
+  return true;
+}
+
+static_assert( test_base2() );
+
+constexpr bool
+test_base36()
+{
+  std::to_chars_result res;
+  char buf[10] = "XXXXXXXXX";
+  res = std::to_chars(buf, buf+1, 1234, 36);
+  VERIFY( res.ptr == buf+1 );
+  VERIFY( res.ec == std::errc::value_too_large );
+  res = std::to_chars(buf, buf+2, -1234, 36);
+  VERIFY( res.ptr == buf+2 );
+  VERIFY( res.ec == std::errc::value_too_large );
+  res = std::to_chars(buf, buf+3, 1234, 36);
+  VERIFY( res.ptr == buf+2 );
+  VERIFY( res.ec == std::errc{} );
+  VERIFY( buf[0] == 'y' );
+  VERIFY( buf[1] == 'a' );
+  VERIFY( buf[3] == 'X' );
+  res = std::to_chars(buf, buf+10, -567, 36);
+  VERIFY( res.ptr == buf+3 );
+  VERIFY( res.ec == std::errc{} );
+  VERIFY( buf[0] == '-' );
+  VERIFY( buf[1] == 'f' );
+  VERIFY( buf[2] == 'r' );
+  VERIFY( buf[4] == 'X' );
+  return true;
+}
+
+static_assert( test_base36() );
diff --git a/libstdc++-v3/testsuite/20_util/to_chars/version.cc b/libstdc++-v3/testsuite/20_util/to_chars/version.cc
new file mode 100644
index 0000000..af06e1b
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/to_chars/version.cc
@@ -0,0 +1,16 @@
+// { dg-options "-std=gnu++23" }
+// { dg-do preprocess { target c++23 } }
+
+#include <version>
+
+#ifndef __cpp_lib_to_chars
+# error "Feature-test macro for to_chars missing in <version>"
+#elif __cpp_lib_to_chars != 201611L
+# error "Feature-test macro for to_chars has wrong value in <version>"
+#endif
+
+#ifndef __cpp_lib_constexpr_charconv
+# error "Feature-test macro for constexpr charconv missing in <version>"
+#elif __cpp_lib_constexpr_charconv != 202202L
+# error "Feature-test macro for constexpr charconv has wrong value in <version>"
+#endif
diff --git a/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3677.cc b/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3677.cc
new file mode 100644
index 0000000..649b98d
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3677.cc
@@ -0,0 +1,52 @@
+// { dg-options "-std=gnu++23" }
+// { dg-do run { target c++20 } }
+
+#include <memory>
+#include <testsuite_hooks.h>
+
+struct UsesAlloc
+{
+  using allocator_type = std::allocator<int>;
+
+  bool passed_alloc;
+
+  UsesAlloc(int) : passed_alloc(false) { }
+
+  UsesAlloc(int, std::allocator<int>) : passed_alloc(true) { }
+};
+
+using Pair = std::pair<UsesAlloc, int>;
+
+void
+test_const()
+{
+  std::allocator<int> a;
+  int i = 0;
+  auto p = std::make_obj_using_allocator<const Pair>(a, i, i);
+  VERIFY( p.first.passed_alloc );
+}
+
+void
+test_volatile()
+{
+  std::allocator<int> a;
+  int i = 0;
+  auto p = std::make_obj_using_allocator<volatile Pair>(a, i, i);
+  VERIFY( p.first.passed_alloc );
+}
+
+void
+test_const_volatile()
+{
+  std::allocator<int> a;
+  int i = 0;
+  auto p = std::make_obj_using_allocator<volatile Pair>(a, i, i);
+  VERIFY( p.first.passed_alloc );
+}
+
+int main()
+{
+  test_const();
+  test_volatile();
+  test_const_volatile();
+}