]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
libstdc++: Support maps deduction from_range of tuples.
authorTomasz Kamiński <tkaminsk@redhat.com>
Wed, 19 Mar 2025 10:42:50 +0000 (11:42 +0100)
committerTomasz Kamiński <tkaminsk@redhat.com>
Wed, 19 Mar 2025 13:49:22 +0000 (14:49 +0100)
This implements part of LWG4223 that enables deduction for maps types
(map, unordered_map, flat_map and non-unique equivalent) from
(from_range, rg, ...) arguments, where rg is range of tuple
or other pair-like.

libstdc++-v3/ChangeLog:

* include/bits/ranges_base.h (__detail::__range_key_type):
Replace RV::first_type with tuple_element_t<0, RV>.
(__detail::__range_mapped_type) Replace RV::second_type
with tuple_element_t<1, RV>.
* testsuite/23_containers/flat_map/1.cc: New tests.
* testsuite/23_containers/flat_multimap/1.cc: New tests.
* testsuite/23_containers/map/cons/from_range.cc: New tests.
* testsuite/23_containers/multimap/cons/from_range.cc: New tests.
* testsuite/23_containers/unordered_map/cons/from_range.cc: New tests.
* testsuite/23_containers/unordered_multimap/cons/from_range.cc:
New tests.

Reviewed-by: Jonathan Wakely <jwakely@redhat.com>
Signed-off-by: Tomasz Kamiński <tkaminsk@redhat.com>
libstdc++-v3/include/bits/ranges_base.h
libstdc++-v3/testsuite/23_containers/flat_map/1.cc
libstdc++-v3/testsuite/23_containers/flat_multimap/1.cc
libstdc++-v3/testsuite/23_containers/map/cons/from_range.cc
libstdc++-v3/testsuite/23_containers/multimap/cons/from_range.cc
libstdc++-v3/testsuite/23_containers/unordered_map/cons/from_range.cc
libstdc++-v3/testsuite/23_containers/unordered_multimap/cons/from_range.cc

index c9687c256e99cd531a3532f3bee369bbfc7219f8..13bfbb3795bfe5ff70d2b0ca1a3fb30000b06e14 100644 (file)
 #include <bits/max_size_type.h>
 #include <bits/version.h>
 
+#if __glibcxx_ranges_to_container // C++ >= 23
+# include <bits/utility.h> // for tuple_element_t
+#endif
+
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wpedantic" // __int128
 
@@ -1093,13 +1097,15 @@ namespace __detail
       = ranges::input_range<_Rg>
          && convertible_to<ranges::range_reference_t<_Rg>, _Tp>;
 
+  // _GLIBCXX_RESOLVE_LIB_DEFECTS
+  // 4223. Deduction guides for maps are mishandling tuples and references
   template<ranges::input_range _Range>
     using __range_key_type
-      = remove_const_t<typename ranges::range_value_t<_Range>::first_type>;
+      = remove_const_t<tuple_element_t<0, ranges::range_value_t<_Range>>>;
 
   template<ranges::input_range _Range>
     using __range_mapped_type
-      = typename ranges::range_value_t<_Range>::second_type;
+      = tuple_element_t<1, ranges::range_value_t<_Range>>;
 
   // The allocator's value_type for map-like containers.
   template<ranges::input_range _Range>
index 00254dc2ee623982f2782b761661f0784bef5f6a..d9d88c4df6ec6fbf797e147fd365dbea95380b30 100644 (file)
 #include <vector>
 #include <testsuite_allocator.h>
 #include <testsuite_hooks.h>
+#include <testsuite_iterators.h>
+#include <tuple>
+
+struct Gt {
+  template<typename T, typename U>
+  bool operator()(T const& l, U const & r) const
+  { return l > r; }
+};
+
+void
+test_deduction_guide()
+{
+  __gnu_test::test_input_range<std::pair<long, float>> r(0, 0);
+  std::flat_map it1(r.begin(), r.begin());
+  static_assert(std::is_same_v<decltype(it1), std::flat_map<long, float>>);
+  std::flat_map fr1(std::from_range, r);
+  static_assert(std::is_same_v<decltype(fr1), std::flat_map<long, float>>);
+
+  Gt cmp;
+  std::flat_map it2(r.begin(), r.begin(), cmp);
+  static_assert(std::is_same_v<decltype(it2), std::flat_map<long, float, Gt>>);
+  std::flat_map fr2(std::from_range, r, cmp);
+  static_assert(std::is_same_v<decltype(fr2), std::flat_map<long, float, Gt>>);
+
+  using Alloc = __gnu_test::SimpleAllocator<std::pair<const long, float>>;
+  Alloc alloc;
+  // No matching deduction guide
+  // std::flat_map it3(r.begin(), r.begin(), alloc);
+  std::flat_map fr3(std::from_range, r, alloc);
+  static_assert(std::is_same_v<
+     decltype(fr3),
+     std::flat_map<long, float, std::less<long>,
+                  std::vector<long, __gnu_test::SimpleAllocator<long>>,
+                  std::vector<float, __gnu_test::SimpleAllocator<float>>>>);
+
+  // No matching deduction guide
+  // std::flat_map it4(r.begin(), r.begin(), cmp, alloc);
+  std::flat_map fr4(std::from_range, r, cmp, alloc);
+  static_assert(std::is_same_v<
+     decltype(fr4),
+     std::flat_map<long, float, Gt,
+                  std::vector<long, __gnu_test::SimpleAllocator<long>>,
+                  std::vector<float, __gnu_test::SimpleAllocator<float>>>>);
+
+  // LWG4223: deduces flat_map<long, float const>, which in turn instantiates
+  // std::vector<cosnt float> that is ill-formed.
+  // __gnu_test::test_input_range<std::pair<const long, const float>> r2(0, 0);
+  // std::flat_map it5(r2.begin(), r2.begin());
+  // std::flat_map fr5(std::from_range, r2);
+
+  // LWG4223: deduces flat_map<const long&, float&>
+  //__gnu_test::test_input_range<std::pair<const long&, float&>> r3(0, 0);
+  // std::flat_map it6(r3.begin(), r3.begin());
+  // std::flat_map fr6(std::from_range, r3);
+
+  __gnu_test::test_input_range<std::tuple<long, float>> r4(0, 0);
+  std::flat_map it7(r4.begin(), r4.begin());
+  static_assert(std::is_same_v<decltype(it7), std::flat_map<long, float>>);
+  std::flat_map fr7(std::from_range, r4);
+  static_assert(std::is_same_v<decltype(fr7), std::flat_map<long, float>>);
+}
 
 template<template<typename> class KeyContainer, template<typename> class MappedContainer>
 void
index 38650a81bcffbba5342b1e499c5a41925e32589c..ff180bf1bdf59624baa876bdc9ca4c9e853af883 100644 (file)
@@ -5,6 +5,71 @@
 #include <vector>
 #include <testsuite_allocator.h>
 #include <testsuite_hooks.h>
+#include <testsuite_iterators.h>
+#include <tuple>
+
+struct Gt {
+  template<typename T, typename U>
+  bool operator()(T const& l, U const & r) const
+  { return l > r; }
+};
+
+void
+test_deduction_guide()
+{
+  __gnu_test::test_input_range<std::pair<long, float>> r(0, 0);
+  std::flat_multimap it1(r.begin(), r.begin());
+  static_assert(std::is_same_v<decltype(it1), std::flat_multimap<long, float>>);
+  std::flat_multimap fr1(std::from_range, r);
+  static_assert(std::is_same_v<decltype(fr1), std::flat_multimap<long, float>>);
+
+  Gt cmp;
+  std::flat_multimap it2(r.begin(), r.begin(), cmp);
+  static_assert(std::is_same_v<
+    decltype(it2),
+    std::flat_multimap<long, float, Gt>>);
+  std::flat_multimap fr2(std::from_range, r, cmp);
+  static_assert(std::is_same_v<
+    decltype(fr2),
+    std::flat_multimap<long, float, Gt>>);
+
+  using Alloc = __gnu_test::SimpleAllocator<std::pair<const long, float>>;
+  Alloc alloc;
+  // No matching deduction guide
+  // std::flat_multimap it3(r.begin(), r.begin(), alloc);
+  std::flat_multimap fr3(std::from_range, r, alloc);
+  static_assert(std::is_same_v<
+     decltype(fr3),
+     std::flat_multimap<long, float, std::less<long>,
+                  std::vector<long, __gnu_test::SimpleAllocator<long>>,
+                  std::vector<float, __gnu_test::SimpleAllocator<float>>>>);
+
+  // No matching deduction guide
+  // std::flat_multimap it4(r.begin(), r.begin(), cmp, alloc);
+  std::flat_multimap fr4(std::from_range, r, cmp, alloc);
+  static_assert(std::is_same_v<
+     decltype(fr4),
+     std::flat_multimap<long, float, Gt,
+                  std::vector<long, __gnu_test::SimpleAllocator<long>>,
+                  std::vector<float, __gnu_test::SimpleAllocator<float>>>>);
+
+  // LWG4223: deduces flat_multimap<long, float const>, which in turn instantiates
+  // std::vector<cosnt float> that is ill-formed.
+  // __gnu_test::test_input_range<std::pair<const long, const float>> r2(0, 0);
+  // std::flat_multimap it5(r2.begin(), r2.begin());
+  // std::flat_multimap fr5(std::from_range, r2);
+
+  // LWG4223: deduces flat_multimap<const long&, float&>
+  //__gnu_test::test_input_range<std::pair<const long&, float&>> r3(0, 0);
+  // std::flat_multimap it6(r3.begin(), r3.begin());
+  // std::flat_multimap fr6(std::from_range, r3);
+
+  __gnu_test::test_input_range<std::tuple<long, float>> r4(0, 0);
+  std::flat_multimap it7(r4.begin(), r4.begin());
+  static_assert(std::is_same_v<decltype(it7), std::flat_multimap<long, float>>);
+  std::flat_multimap fr7(std::from_range, r4);
+  static_assert(std::is_same_v<decltype(fr7), std::flat_multimap<long, float>>);
+}
 
 template<template<typename> class KeyContainer, template<typename> class MappedContainer>
 void
index 01e426fde3dfe22b38aa86e1e5063b94f9dbab94..c740471f2da12f9b76f18ce90daab84ea29213c6 100644 (file)
@@ -44,9 +44,11 @@ test_deduction_guide()
   //__gnu_test::test_input_range<std::pair<const long&, float&>> r3(0, 0);
   // std::map m6(std::from_range, r3);
 
-  // LWG4223: no deduction guide
-  // __gnu_test::test_input_range<std::tuple<long, float>> r4(0, 0);
-  // std::map m7(std::from_range, r4);
+  __gnu_test::test_input_range<std::tuple<long, float>> r4(0, 0);
+  std::map m7(std::from_range, r4);
+  static_assert(std::is_same_v<decltype(m7), std::map<long, float>>);
+  std::map it7(r4.begin(), r4.begin());
+  static_assert(std::is_same_v<decltype(it7), std::map<long, float>>);
 }
 
 template<typename T, typename U>
index e0052e499ca74e7bf0d3d8a2c969c0d000e3411a..3e456f566ccc919b2e1ca576721dbe8cd855888b 100644 (file)
@@ -44,9 +44,11 @@ test_deduction_guide()
   //__gnu_test::test_input_range<std::pair<const long&, float&>> r3(0, 0);
   // std::multimap m6(std::from_range, r3);
 
-  // LWG4223: no deduction guide
-  // __gnu_test::test_input_range<std::tuple<long, float>> r4(0, 0);
-  // std::multimap m7(std::from_range, r4);
+  __gnu_test::test_input_range<std::tuple<long, float>> r4(0, 0);
+  std::multimap m7(std::from_range, r4);
+  static_assert(std::is_same_v<decltype(m7), std::multimap<long, float>>);
+  std::multimap it7(r4.begin(), r4.begin());
+  static_assert(std::is_same_v<decltype(it7), std::multimap<long, float>>);
 }
 
 template<typename T, typename U>
index 51f8538669ae627f47106c57bc93ac47843a3ea6..6d1da5bf5d18966ad16c1182e025c5ca6f7cd03f 100644 (file)
@@ -81,9 +81,11 @@ test_deduction_guide()
   // __gnu_test::test_input_range<std::pair<const long&, float&>> r3(0, 0);
   // std::unordered_map m10(std::from_range, r3);
 
-  // LWG4223: no deduction guide
-  // __gnu_test::test_input_range<std::tuple<long, float>> r4(0, 0);
-  // std::unordered_map m11(std::from_range, r4);
+  __gnu_test::test_input_range<std::tuple<long, float>> r4(0, 0);
+  std::unordered_map m11(std::from_range, r4);
+  static_assert(std::is_same_v<decltype(m11), std::unordered_map<long, float>>);
+  std::unordered_map it11(r4.begin(), r4.begin());
+  static_assert(std::is_same_v<decltype(it11), std::unordered_map<long, float>>);
 }
 
 template<typename T, typename U>
index 1baf7305c84eb61a9967d1b1f0bc179abb281fed..2ca93d344e9b61db07985111e53dd3d8849d8f1e 100644 (file)
@@ -87,9 +87,15 @@ test_deduction_guide()
   // __gnu_test::test_input_range<std::pair<const long&, float&>> r3(0, 0);
   // std::unordered_multimap m10(std::from_range, r3);
 
-  // LWG4223: no deduction guide
-  // __gnu_test::test_input_range<std::tuple<long, float>> r4(0, 0);
-  // std::unordered_multimap m11(std::from_range, r4);
+  __gnu_test::test_input_range<std::tuple<long, float>> r4(0, 0);
+  std::unordered_multimap m11(std::from_range, r4);
+  static_assert(std::is_same_v<
+    decltype(m11),
+    std::unordered_multimap<long, float>>);
+  std::unordered_multimap it11(r4.begin(), r4.begin());
+  static_assert(std::is_same_v<
+    decltype(it11),
+    std::unordered_multimap<long, float>>);
 }
 
 template<typename T, typename U>