feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Drop alloc return value from dumper vectorData() helper

Browse Source 
Only used for checks, do that within the function.

Change-Id: I4cc302864a9d3f8edac6f6364dfdac33b548e60a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-12-07 15:07:13 +01:00
parent 2d9de4f706
commit 8e0cb785dc
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
share/qtcreator/debugger/dumper.py
View File

@@ -571,7 +571,7 @@ class DumperBase():
(ref, alloc, size) = self.split('III', vector_data_ptr) (ref, alloc, size) = self.split('III', vector_data_ptr)
data = vector_data_ptr + 16 data = vector_data_ptr + 16
self.check(0 <= size and size <= alloc and alloc <= 1000 * 1000 * 1000) self.check(0 <= size and size <= alloc and alloc <= 1000 * 1000 * 1000)
return data, size, alloc return data, size
def qArrayData(self, value): def qArrayData(self, value):
if self.qtVersion() >= 0x60000: if self.qtVersion() >= 0x60000:
@@ -1736,7 +1736,7 @@ class DumperBase():
#yield self.createValue(data + i * stepSize, 'void*') #yield self.createValue(data + i * stepSize, 'void*')
def vectorChildrenGenerator(self, value, innerType): def vectorChildrenGenerator(self, value, innerType):
data, size, _ = self.vectorData(value) data, size = self.vectorData(value)
for i in range(size): for i in range(size):
yield self.createValue(data + i * innerType.size(), innerType) yield self.createValue(data + i * innerType.size(), innerType)
@@ -2148,7 +2148,7 @@ class DumperBase():
with Children(self): with Children(self):
innerType = connections.type[0] innerType = connections.type[0]
# Should check: innerType == ns::QObjectPrivate::ConnectionList # Should check: innerType == ns::QObjectPrivate::ConnectionList
data, size, _ = self.vectorData(connections) data, size = self.vectorData(connections)
connectionType = self.createType('@QObjectPrivate::Connection') connectionType = self.createType('@QObjectPrivate::Connection')
for i in range(size): for i in range(size):
first = self.extractPointer(data + i * 2 * ptrSize) first = self.extractPointer(data + i * 2 * ptrSize)

20
share/qtcreator/debugger/qttypes.py
View File

@@ -1657,13 +1657,13 @@ def qdump__QStack(d, value):
def qdump__QPolygonF(d, value): def qdump__QPolygonF(d, value):
data, size, _ = d.vectorData(value) data, size = d.vectorData(value)
d.putItemCount(size) d.putItemCount(size)
d.putPlotData(data, size, d.createType('@QPointF')) d.putPlotData(data, size, d.createType('@QPointF'))
def qdump__QPolygon(d, value): def qdump__QPolygon(d, value):
data, size, _ = d.vectorData(value) data, size = d.vectorData(value)
d.putItemCount(size) d.putItemCount(size)
d.putPlotData(data, size, d.createType('@QPoint')) d.putPlotData(data, size, d.createType('@QPoint'))
@@ -1677,7 +1677,7 @@ def qdump__QGraphicsPolygonItem(d, value):
offset = 328 if d.isMsvcTarget() else 320 offset = 328 if d.isMsvcTarget() else 320
else: else:
offset = 308 offset = 308
data, size, alloc = d.vectorData(dptr + offset) data, size = d.vectorData(dptr + offset)
d.putItemCount(size) d.putItemCount(size)
d.putPlotData(data, size, d.createType('@QPointF')) d.putPlotData(data, size, d.createType('@QPointF'))
@@ -2180,7 +2180,7 @@ def qdumpHelper__QVariant45(d, value):
def qedit__QVector(d, value, data): def qedit__QVector(d, value, data):
values = data.split(',') values = data.split(',')
d.call('void', value, 'resize', str(len(values))) d.call('void', value, 'resize', str(len(values)))
base, vsize, valloc = d.vectorData(value) base, vsize = d.vectorData(value)
d.setValues(base, value.type[0].name, values) d.setValues(base, value.type[0].name, values)
@@ -2198,16 +2198,14 @@ def qdump__QVector(d, value):
if value.type.name == d.qtNamespace() + "QVector": if value.type.name == d.qtNamespace() + "QVector":
d.putBetterType(value.type.name + '<' + value.type.ltarget[0].name + '>') d.putBetterType(value.type.name + '<' + value.type.ltarget[0].name + '>')
else: else:
data, size, alloc = d.vectorData(value) data, size = d.vectorData(value)
d.check(0 <= size and size <= alloc and alloc <= 1000 * 1000 * 1000)
d.putItemCount(size) d.putItemCount(size)
d.putPlotData(data, size, value.type[0]) d.putPlotData(data, size, value.type[0])
if False: if False:
def qdump__QObjectConnectionList(d, value): def qdump__QObjectConnectionList(d, value):
data, size, alloc = d.vectorData(value) data, size = d.vectorData(value)
d.check(0 <= size and size <= alloc and alloc <= 1000 * 1000 * 1000)
d.putItemCount(size) d.putItemCount(size)
d.putPlotData(data, size, d.createType('@QObjectPrivate::ConnectionList')) d.putPlotData(data, size, d.createType('@QObjectPrivate::ConnectionList'))
@@ -3245,7 +3243,7 @@ def qdumpHelper_QCbor_string(d, container_ptr, element_index, is_bytes):
# d.split('i@{@QByteArray::size_type}pp', container_ptr) doesn't work with CDB, # d.split('i@{@QByteArray::size_type}pp', container_ptr) doesn't work with CDB,
# so be explicit: # so be explicit:
pos = container_ptr + (2 * d.ptrSize() if d.qtVersion() >= 0x060000 else 8) pos = container_ptr + (2 * d.ptrSize() if d.qtVersion() >= 0x060000 else 8)
elements_data_ptr, elements_size, _ = d.vectorData(pos + d.ptrSize()) elements_data_ptr, elements_size = d.vectorData(pos + d.ptrSize())
element_at_n_addr = elements_data_ptr + element_index * 16 # sizeof(QtCbor::Element) == 15 element_at_n_addr = elements_data_ptr + element_index * 16 # sizeof(QtCbor::Element) == 15
element_value, _, element_flags = d.split('qII', element_at_n_addr) element_value, _, element_flags = d.split('qII', element_at_n_addr)
enc = 'latin1' if is_bytes or (element_flags & 8) else 'utf16' enc = 'latin1' if is_bytes or (element_flags & 8) else 'utf16'
@@ -3281,7 +3279,7 @@ def qdumpHelper_QCbor_array(d, container_ptr, is_cbor):
# d.split('i@{@QByteArray::size_type}pp', container_ptr) doesn't work with CDB, # d.split('i@{@QByteArray::size_type}pp', container_ptr) doesn't work with CDB,
# so be explicit: # so be explicit:
pos = container_ptr + (2 * d.ptrSize() if d.qtVersion() >= 0x060000 else 8) pos = container_ptr + (2 * d.ptrSize() if d.qtVersion() >= 0x060000 else 8)
elements_data_ptr, elements_size, _ = d.vectorData(pos + d.ptrSize()) elements_data_ptr, elements_size = d.vectorData(pos + d.ptrSize())
d.putItemCount(elements_size) d.putItemCount(elements_size)
if d.isExpanded(): if d.isExpanded():
bytedata, _, _ = d.qArrayData(pos) bytedata, _, _ = d.qArrayData(pos)
@@ -3302,7 +3300,7 @@ def qdumpHelper_QCbor_map(d, container_ptr, is_cbor):
# d.split('i@{@QByteArray::size_type}pp', container_ptr) doesn't work with CDB, # d.split('i@{@QByteArray::size_type}pp', container_ptr) doesn't work with CDB,
# so be explicit: # so be explicit:
pos = container_ptr + (2 * d.ptrSize() if d.qtVersion() >= 0x060000 else 8) pos = container_ptr + (2 * d.ptrSize() if d.qtVersion() >= 0x060000 else 8)
elements_data_ptr, elements_size, _ = d.vectorData(pos + d.ptrSize()) elements_data_ptr, elements_size = d.vectorData(pos + d.ptrSize())
elements_size = int(elements_size / 2) elements_size = int(elements_size / 2)
d.putItemCount(elements_size) d.putItemCount(elements_size)
if d.isExpanded(): if d.isExpanded():