diff mbox series

[committed] libstdc++: Fix typos in iterator increment for std::text_encoding [PR117520]

Message ID 20241111185938.1252829-1-jwakely@redhat.com
State New
Headers show
Series [committed] libstdc++: Fix typos in iterator increment for std::text_encoding [PR117520] | expand

Commit Message

Jonathan Wakely Nov. 11, 2024, 6:59 p.m. UTC 
The intended behaviour for std::text_encoding::aliases_view's iterator
is that it incrementing or decrementing too far sets it to a
value-initialized state, or fails an assertion when those are enabled.
There were typos that used == instead of = which meant that instead of
becoming singular or aborting, an out-of-range increment just did
nothing. This meant erroneous operations were well-defined and didn't
produce any undefined behaviour, but were not diagnosed with assertions
enabled, as had been intended.

This change fixes the bugs and adds more tests to verify the intended
behaviour.

libstdc++-v3/ChangeLog:

	PR libstdc++/117520
	* include/std/text_encoding (aliases_view:_Iterator::operator+=):
	Fix typos that caused == to be used instead of =.
	(aliases_view::_Iterator): Fix friend declaration.
	* testsuite/std/text_encoding/members.cc: Adjust expected
	behaviour of invalid subscript. Add tests for other erroneous
	operations on iterators.
---
Tested x86_64-linux. Pushed to trunk. Will backport to gcc-14 too.

 libstdc++-v3/include/std/text_encoding        |  6 +++---
 .../testsuite/std/text_encoding/members.cc    | 19 +++++++++++++++++--
 2 files changed, 20 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/libstdc++-v3/include/std/text_encoding b/libstdc++-v3/include/std/text_encoding
index 48742dcb076..6fcaed1ab6a 100644
--- a/libstdc++-v3/include/std/text_encoding
+++ b/libstdc++-v3/include/std/text_encoding
@@ -575,7 +575,7 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
 			  && _M_rep[__n - 1]._M_id == _M_id) [[likely]]
 		 _M_rep += __n;
 	      else
-		*this == _Iterator{};
+		*this = _Iterator{};
 	    }
 	  else if (__n < 0)
 	    {
@@ -583,7 +583,7 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
 		    && _M_rep[__n]._M_id == _M_id) [[likely]]
 		 _M_rep += __n;
 	      else
-		*this == _Iterator{};
+		*this = _Iterator{};
 	    }
 	}
       if (__n != 0)
@@ -645,7 +645,7 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
     }
 
   private:
-    friend class text_encoding;
+    friend struct text_encoding;
 
     constexpr explicit
     _Iterator(const _Rep* __r) noexcept
diff --git a/libstdc++-v3/testsuite/std/text_encoding/members.cc b/libstdc++-v3/testsuite/std/text_encoding/members.cc
index adbd74ab85e..253653250c8 100644
--- a/libstdc++-v3/testsuite/std/text_encoding/members.cc
+++ b/libstdc++-v3/testsuite/std/text_encoding/members.cc
@@ -70,10 +70,25 @@  test_every_id()
     auto end = aliases.end();
     VERIFY( (begin + std::ranges::distance(aliases)) == end );
 #ifndef _GLIBCXX_ASSERTIONS
-    // This is an error, but with assertions disabled is guaranteed safe:
+    // These ops violate preconditions, but as libstdc++ extensions they are
+    // guaranteed to either assert or have well-defined behaviour.
+
+    // This erroneously returns ""sv:
     VERIFY( begin[std::ranges::distance(aliases)] == ""sv );
     // Likewise:
-    VERIFY( begin[999999] == *begin );
+    VERIFY( begin[999999] == ""sv );
+
+    auto iter = begin;
+    std::ranges::advance(iter, end);
+    // Erroneously sets iter to a value-initialized state.
+    ++iter;
+    VERIFY( iter == decltype(iter){} );
+    VERIFY( *iter == ""sv );
+
+    iter = begin;
+    // Erroneously sets iter to a value-initialized state.
+    --iter;
+    VERIFY( iter == decltype(iter){} );
 #endif
   }
 }