procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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.
This commit is contained in:
Jonathan Wakely 2023-11-14 15:08:13 +00:00
parent cbd0fe22a5
commit 452476db0c
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libstdc++-v3/python/libstdcxx/v6/xmethods.py
View file

@ -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):

6
libstdc++-v3/testsuite/libstdc++-xmethods/deque.cc
View file

@ -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 } }