libstdc++: LWG 3301 transform_view::iterator has incorrect iterator_category

libstdc++-v3/ChangeLog:

	LWG 3301 transform_view::_Iterator has incorrect iterator_category
	* include/std/ranges (transform_view::_Iterator::_S_iter_cat): Adjust
	determination of iterator_category as per LWG 3301.
	* testsuite/std/ranges/adaptors/transform.cc: Augment test.

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 046d50de6d1755984e6d9a6520814ab7a254be31..1a56a7d221c9be4aba1aea3d915b8b1c74ab143a 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
 2020-02-25  Patrick Palka  <ppalka@redhat.com>
 
+       LWG 3301 transform_view::_Iterator has incorrect iterator_category
+       * include/std/ranges (transform_view::_Iterator::_S_iter_cat): Adjust
+       determination of iterator_category as per LWG 3301.
+       * testsuite/std/ranges/adaptors/transform.cc: Augment test.
+
        LWG 3292 iota_view is under-constrained
        * include/std/ranges (iota_view): Require that _Winc models semiregular
          as per LWG 3292.

diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges
index ab8fbaca38f6c36058bcaaf4c7ded1111a6c0422..aed90e9710e1ffc671f0c3dd69df05ac5534b22e 100644 (file)
--- a/libstdc++-v3/include/std/ranges
+++ b/libstdc++-v3/include/std/ranges
@@ -1570,12 +1570,18 @@ namespace views
          static constexpr auto
          _S_iter_cat()
          {
-           using _Cat
-              = typename iterator_traits<_Base_iter>::iterator_category;
-           if constexpr (derived_from<_Cat, contiguous_iterator_tag>)
-             return random_access_iterator_tag{};
+           using _Res = invoke_result_t<_Fp&, range_reference_t<_Base>>;
+           if constexpr (is_lvalue_reference_v<_Res>)
+             {
+               using _Cat
+                 = typename iterator_traits<_Base_iter>::iterator_category;
+               if constexpr (derived_from<_Cat, contiguous_iterator_tag>)
+                 return random_access_iterator_tag{};
+               else
+                 return _Cat{};
+             }
            else
-             return _Cat{};
+             return input_iterator_tag{};
          }
 
          static constexpr decltype(auto)

diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/transform.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/transform.cc
index ad51fffb43dd6ab105a7f46ff896fb9f64919df2..178544d6378f05b93209f71f14740a2b9a6a9aaa 100644 (file)
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/transform.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/transform.cc
@@ -77,10 +77,34 @@ test03()
   VERIFY( ranges::equal(v, (int[]){1,2,3,4,5}) );
 }
 
+void
+test04()
+{
+  // LWG 3301
+    {
+      auto f = [] (int x) { return x; };
+      int x[] = {1,2,3,4,5};
+      auto v = x | views::transform(f);
+      auto i = v.begin();
+      using Cat = decltype(i)::iterator_category;
+      static_assert(std::same_as<Cat, std::input_iterator_tag>);
+    }
+
+    {
+      auto f = [] (int &x) -> int& { return x; };
+      int x[] = {1,2,3,4,5};
+      auto v = x | views::transform(f);
+      auto i = v.begin();
+      using Cat = decltype(i)::iterator_category;
+      static_assert(std::derived_from<Cat, std::forward_iterator_tag>);
+    }
+}
+
 int
 main()
 {
   test01();
   test02();
   test03();
+  test04();
 }