diff mbox series

[committed] libstdc++: Fix std::deque::operator[] Xmethod [PR112491]

Message ID 20231115113019.1048370-1-jwakely@redhat.com
State New
Headers show
Series [committed] libstdc++: Fix std::deque::operator[] Xmethod [PR112491] | expand

Commit Message

Jonathan Wakely Nov. 15, 2023, 11:30 a.m. UTC 
Tested x86_64-linux. Pushed to trunk. Backports to follow.

-- >8 --

The Xmethod for std::deque::operator[] has the same bug that I recently
fixed for the std::deque::size() Xmethod. The first node might have
unused capacity at the start, which needs to be accounted for when
indexing into the deque.

libstdc++-v3/ChangeLog:

	PR libstdc++/112491
	* python/libstdcxx/v6/xmethods.py (DequeWorkerBase.index):
	Correctly handle unused capacity at the start of the first node.
	* testsuite/libstdc++-xmethods/deque.cc: Check index operator
	when elements have been removed from the front.
---
 libstdc++-v3/python/libstdcxx/v6/xmethods.py       | 12 ++++++++----
 libstdc++-v3/testsuite/libstdc++-xmethods/deque.cc |  6 +++++-
 2 files changed, 13 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/libstdc++-v3/python/libstdcxx/v6/xmethods.py b/libstdc++-v3/python/libstdcxx/v6/xmethods.py
index dcef285180a..f29bc2d40fb 100644
--- a/libstdc++-v3/python/libstdcxx/v6/xmethods.py
+++ b/libstdc++-v3/python/libstdcxx/v6/xmethods.py
@@ -195,7 +195,7 @@  class DequeWorkerBase(gdb.xmethod.XMethodWorker):
     def size(self, obj):
         start = obj['_M_impl']['_M_start']
         finish = obj['_M_impl']['_M_finish']
-        if not start['_M_node']:
+        if start['_M_cur'] == finish['_M_cur']:
             return 0
         return (self._bufsize
                 * (finish['_M_node'] - start['_M_node'] - 1)
@@ -203,9 +203,13 @@  class DequeWorkerBase(gdb.xmethod.XMethodWorker):
                 + (start['_M_last'] - start['_M_cur']))
 
     def index(self, obj, idx):
-        first_node = obj['_M_impl']['_M_start']['_M_node']
-        index_node = first_node + int(idx) // self._bufsize
-        return index_node[0][idx % self._bufsize]
+        start = obj['_M_impl']['_M_start']
+        first_node_size = start['_M_last'] - start['_M_cur']
+        if idx < first_node_size:
+            return start['_M_cur'][idx]
+        idx = idx - first_node_size
+        index_node = start['_M_node'][1 + int(idx) // self._bufsize]
+        return index_node[idx % self._bufsize]
 
 
 class DequeEmptyWorker(DequeWorkerBase):
diff --git a/libstdc++-v3/testsuite/libstdc++-xmethods/deque.cc b/libstdc++-v3/testsuite/libstdc++-xmethods/deque.cc
index e4077c14ff5..6058d23c87a 100644
--- a/libstdc++-v3/testsuite/libstdc++-xmethods/deque.cc
+++ b/libstdc++-v3/testsuite/libstdc++-xmethods/deque.cc
@@ -69,20 +69,24 @@  main ()
 
   // PR libstdc++/112491
   std::deque<int> q5;
-  q5.push_front(0);
+  q5.push_front(5);
 // { dg-final { note-test q5.size() 1 } }
+// { dg-final { note-test q5\[0\] 5 } }
   std::deque<int> q6 = q1;
   q6.pop_front();
 // { dg-final { note-test {q6.size() == (q1_size-1)} true } }
+// { dg-final { note-test q6\[1\] 102 } }
   std::deque<int> q7 = q2;
   q7.pop_front();
   q7.pop_front();
 // { dg-final { note-test {q7.size() == (q2_size-2)} true } }
+// { dg-final { note-test q7\[1\] 203 } }
   std::deque<int> q8 = q3;
   q8.pop_front();
   q8.pop_front();
   q8.pop_front();
 // { dg-final { note-test {q8.size() == (q3_size-3)} true } }
+// { dg-final { note-test q8\[1\] 304 } }
   std::deque<int> q9 = q8;
   q9.clear();
 // { dg-final { note-test q9.size() 0 } }