rebase

huixie90 · huixie90 · commit 01bfe4235414 · 2025-06-21T20:23:38.000+01:00
diff --git a/libcxx/include/__flat_map/utils.h b/libcxx/include/__flat_map/utils.h
@@ -94,7 +94,7 @@ struct __flat_map_utils {
   }
 
   template <class _Map, class _InputIterator>
-  _LIBCPP_HIDE_FROM_ABI static typename _Map::size_type
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 static typename _Map::size_type
   __append(_Map& __map, _InputIterator __first, _InputIterator __last)
     requires __is_product_iterator_of_size<_InputIterator, 2>::value
   {
diff --git a/libcxx/test/libcxx/iterators/product_iterator.pass.cpp b/libcxx/test/libcxx/iterators/product_iterator.pass.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: c++03, c++11, c++14, c++17
+// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20
 // gcc 15 does not seem to recognize the __product_iterator_traits specializations
 // UNSUPPORTED: gcc
 

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ struct __flat_map_utils {`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`template <class _Map, class _InputIterator>`
`97`		`- _LIBCPP_HIDE_FROM_ABI static typename _Map::size_type`
	`97`	`+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 static typename _Map::size_type`
`98`	`98`	`__append(_Map& __map, _InputIterator __first, _InputIterator __last)`
`99`	`99`	`requires __is_product_iterator_of_size<_InputIterator, 2>::value`
`100`	`100`	`{`