git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libstdc++/77645 fix deque and vector xmethods for Python 3 

PR libstdc++/77645
	* python/libstdcxx/v6/xmethods.py (DequeWorkerBase.__init__)
	(DequeWorkerBase.index, VectorWorkerBase.get): Cast results of
	division to int to work with Python 3.

From-SVN: r240242
This commit is contained in:
Jonathan Wakely 2016-09-19 18:14:11 +01:00 committed by Jonathan Wakely
parent 5d1e95e278
commit 760b143fa2
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
2016-09-19 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/77645
* python/libstdcxx/v6/xmethods.py (DequeWorkerBase.__init__)
(DequeWorkerBase.index, VectorWorkerBase.get): Cast results of
division to int to work with Python 3.
2016-08-23 Jonathan Wakely <jwakely@redhat.com> 2016-08-23 Jonathan Wakely <jwakely@redhat.com>
* testsuite/23_containers/map/77334.cc: Use dg-options for C++11. * testsuite/23_containers/map/77334.cc: Use dg-options for C++11.

6
libstdc++-v3/python/libstdcxx/v6/xmethods.py
View File

@ -165,7 +165,7 @@ class ArrayMethodsMatcher(gdb.xmethod.XMethodMatcher):
class DequeWorkerBase(gdb.xmethod.XMethodWorker): class DequeWorkerBase(gdb.xmethod.XMethodWorker):
def __init__(self, val_type): def __init__(self, val_type):
self._val_type = val_type self._val_type = val_type
self._bufsize = (512 / val_type.sizeof) or 1 self._bufsize = int(512 / val_type.sizeof) or 1
def size(self, obj): def size(self, obj):
first_node = obj['_M_impl']['_M_start']['_M_node'] first_node = obj['_M_impl']['_M_start']['_M_node']
@ -176,7 +176,7 @@ class DequeWorkerBase(gdb.xmethod.XMethodWorker):
def index(self, obj, index): def index(self, obj, index):
first_node = obj['_M_impl']['_M_start']['_M_node'] first_node = obj['_M_impl']['_M_start']['_M_node']
index_node = first_node + index / self._bufsize index_node = first_node + int(index / self._bufsize)
return index_node[0][index % self._bufsize] return index_node[0][index % self._bufsize]
class DequeEmptyWorker(DequeWorkerBase): class DequeEmptyWorker(DequeWorkerBase):
@ -410,7 +410,7 @@ class VectorWorkerBase(gdb.xmethod.XMethodWorker):
if self._val_type.code == gdb.TYPE_CODE_BOOL: if self._val_type.code == gdb.TYPE_CODE_BOOL:
start = obj['_M_impl']['_M_start']['_M_p'] start = obj['_M_impl']['_M_start']['_M_p']
bit_size = start.dereference().type.sizeof * 8 bit_size = start.dereference().type.sizeof * 8
valp = start + index / bit_size valp = start + int(index / bit_size)
offset = index % bit_size offset = index % bit_size
return (valp.dereference() & (1 << offset)) > 0 return (valp.dereference() & (1 << offset)) > 0
else: else: