[committed] libstdc++: Fix __gnu_test::input_iterator_wrapper::operator++(int)

Message ID 20200601173111.GA3768561@redhat.com
State New
Headers show
Series
  • [committed] libstdc++: Fix __gnu_test::input_iterator_wrapper::operator++(int)
Related show

Commit Message

Kees Cook via Gcc-patches June 1, 2020, 5:31 p.m.
I noticed recently that our input_iterator_wrapper utility for writing
tests has the following post-increment operator:

    void
    operator++(int)
    {
      ++*this;
    }

That fails to meet the Cpp17InputIterator requirement that *r++ is
valid. This change makes it return a non-void proxy type that can be
deferenced to produce another proxy, which is convertible to the
value_type. The second proxy converts to const T& to ensure it can't be
written to.

	* testsuite/util/testsuite_iterators.h:
	(input_iterator_wrapper::operator++(int)): Return proxy object.

Tested powerpc64le-linux, committed to master.
commit 118158b646d402b0fb5d760e4827611b731fe6f3
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Mon Jun 1 18:30:47 2020 +0100

    libstdc++: Fix __gnu_test::input_iterator_wrapper::operator++(int)
    
    I noticed recently that our input_iterator_wrapper utility for writing
    tests has the following post-increment operator:
    
        void
        operator++(int)
        {
          ++*this;
        }
    
    That fails to meet the Cpp17InputIterator requirement that *r++ is
    valid. This change makes it return a non-void proxy type that can be
    deferenced to produce another proxy, which is convertible to the
    value_type. The second proxy converts to const T& to ensure it can't be
    written to.
    
            * testsuite/util/testsuite_iterators.h:
            (input_iterator_wrapper::operator++(int)): Return proxy object.

Patch

diff --git a/libstdc++-v3/testsuite/util/testsuite_iterators.h b/libstdc++-v3/testsuite/util/testsuite_iterators.h
index 5be47f47915..71b672c85fa 100644
--- a/libstdc++-v3/testsuite/util/testsuite_iterators.h
+++ b/libstdc++-v3/testsuite/util/testsuite_iterators.h
@@ -208,6 +208,17 @@  namespace __gnu_test
   : public std::iterator<std::input_iterator_tag, typename remove_cv<T>::type,
 			 std::ptrdiff_t, T*, T&>
   {
+    struct post_inc_proxy
+    {
+      struct deref_proxy
+      {
+	T* ptr;
+	operator const T&() const { return *ptr; }
+      } p;
+
+      deref_proxy operator*() const { return p; }
+    };
+
   protected:
     input_iterator_wrapper() : ptr(0), SharedInfo(0)
     { }
@@ -266,10 +277,12 @@  namespace __gnu_test
       return *this;
     }
 
-    void
+    post_inc_proxy
     operator++(int)
     {
+      post_inc_proxy tmp = { { ptr } };
       ++*this;
+      return tmp;
     }
 
 #if __cplusplus >= 201103L