From c7c92d61d32f6fd7746e2844f68d1936e2b6f6f6 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Sat, 18 Nov 2023 20:56:35 +0000
Subject: [PATCH] libstdc++: Check string value_type in std::make_format_args
 [PR112607]

libstdc++-v3/ChangeLog:

	PR libstdc++/112607
	* include/std/format (basic_format_arg::_S_to_arg_type): Check
	value_type for basic_string_view and basic_string
	specializations.
	* testsuite/std/format/arguments/112607.cc: New test.

(cherry picked from commit 279e407a06cc676d8e6e0bb5755b0a804e05377c)
---
 libstdc++-v3/include/std/format               | 12 +++++---
 .../testsuite/std/format/arguments/112607.cc  | 30 +++++++++++++++++++
 2 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 libstdc++-v3/testsuite/std/format/arguments/112607.cc

diff --git a/libstdc++-v3/include/std/format b/libstdc++-v3/include/std/format
index 27d33cb759fb..17ebae676e93 100644
--- a/libstdc++-v3/include/std/format
+++ b/libstdc++-v3/include/std/format
@@ -2976,10 +2976,14 @@ namespace __format
 	    return type_identity<__format::__float128_t>();
 # endif
 #endif
-	  else if constexpr (__is_specialization_of<_Td, basic_string_view>)
-	    return type_identity<basic_string_view<_CharT>>();
-	  else if constexpr (__is_specialization_of<_Td, basic_string>)
-	    return type_identity<basic_string_view<_CharT>>();
+	  else if constexpr (__is_specialization_of<_Td, basic_string_view>
+			    || __is_specialization_of<_Td, basic_string>)
+	    {
+	      if constexpr (is_same_v<typename _Td::value_type, _CharT>)
+		return type_identity<basic_string_view<_CharT>>();
+	      else
+		return type_identity<handle>();
+	    }
 	  else if constexpr (is_same_v<decay_t<_Td>, const _CharT*>)
 	    return type_identity<const _CharT*>();
 	  else if constexpr (is_same_v<decay_t<_Td>, _CharT*>)
diff --git a/libstdc++-v3/testsuite/std/format/arguments/112607.cc b/libstdc++-v3/testsuite/std/format/arguments/112607.cc
new file mode 100644
index 000000000000..19eec765ea58
--- /dev/null
+++ b/libstdc++-v3/testsuite/std/format/arguments/112607.cc
@@ -0,0 +1,30 @@
+// { dg-do compile { target c++20 } }
+
+// PR libstdc++/112607
+// _Normalize does not consider char_type for the basic_string_view case
+
+#include <format>
+
+template<typename T>
+struct Alloc
+{
+  using value_type = T;
+  Alloc() = default;
+  template<typename U>
+    Alloc(const Alloc<U>&) { }
+  T* allocate(std::size_t);
+  void deallocate(T*, std::size_t);
+  bool operator==(const Alloc&) const;
+};
+
+template<typename C>
+using String = std::basic_string<C, std::char_traits<C>, Alloc<C>>;
+
+template<>
+struct std::formatter<String<wchar_t>> : std::formatter<std::string> {
+  auto format(const String<wchar_t>&, auto& ctx) const {
+    return std::formatter<std::string>::format(" ", ctx);
+  }
+};
+
+std::string str = std::format("{}", String<wchar_t>{});
-- 
2.47.2