libstdc++: Fix bug in iterator_traits<common_iterator<S,I>>

The wrong type was being used in the __common_iter_has_arrow constraint,
creating a circular dependency where the iterator_traits specialization
was needed before it was complete. The correct parameter for the
__common_iter_has_arrow concept is the first template argument of  the
common_iterator, not the common_iterator itself.

	* include/bits/stl_iterator.h (__detail::__common_iter_ptr): Change
	to take parameters of common_iterator, instead of the common_iterator
	type itself. Fix argument for __common_iter_has_arrow constraint.
	(iterator_traits<common_iterator<I, S>>::pointer): Adjust.

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7c9a8a63ff9327d6eb28f817f01d4a5aa6905e27..4d8ea9d82123ee608513777c026da382e46fc5e3 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2020-02-07  Jonathan Wakely  <jwakely@redhat.com>
+
+       * include/bits/stl_iterator.h (__detail::__common_iter_ptr): Change
+       to take parameters of common_iterator, instead of the common_iterator
+       type itself. Fix argument for __common_iter_has_arrow constraint.
+       (iterator_traits<common_iterator<I, S>>::pointer): Adjust.
+
 2020-02-07  Jonathan Wakely  <jwakely@redhat.com>
 
        * include/std/ranges (iota_view): Add braces to prevent -Wempty-body

diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h
index 69c6ae66cdf793ec2e0e02e197fc52c3ccc1a755..46804656801345cde1cb7bac2b4ca43b87c6c91c 100644 (file)
--- a/libstdc++-v3/include/bits/stl_iterator.h
+++ b/libstdc++-v3/include/bits/stl_iterator.h
@@ -1738,17 +1738,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   namespace __detail
   {
     // FIXME: This has to be at namespace-scope because of PR 92103.
-    template<typename _Iter>
+    template<typename _It, typename _Sent>
       struct __common_iter_ptr
       {
        using type = void;
       };
 
-    template<typename _Iter>
-      requires __detail::__common_iter_has_arrow<_Iter>
-      struct __common_iter_ptr<_Iter>
+    template<typename _It, typename _Sent>
+      requires __detail::__common_iter_has_arrow<_It>
+      struct __common_iter_ptr<_It, _Sent>
       {
-       using type = decltype(std::declval<const _Iter&>().operator->());
+       using common_iterator = std::common_iterator<_It, _Sent>;
+
+       using type
+         = decltype(std::declval<const common_iterator&>().operator->());
       };
   } // namespace __detail
 
@@ -1762,8 +1765,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        forward_iterator_tag, input_iterator_tag>;
       using value_type = iter_value_t<_It>;
       using difference_type = iter_difference_t<_It>;
-      using pointer = typename
-       __detail::__common_iter_ptr<common_iterator<_It, _Sent>>::type;
+      using pointer = typename __detail::__common_iter_ptr<_It, _Sent>::type;
       using reference = iter_reference_t<_It>;
     };