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

Debugger: Fix pointer arithmetic in dumper framework

Browse Source 
Task-number: QTCREATORBUG-17428
Change-Id: I1e3a682a6f412af51e191dc783b89ff266020e3b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2016-12-13 16:24:57 +01:00
parent 26331f771a
commit 0e6c9d26f1
3 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2880,9 +2880,12 @@ class DumperBase:
elif isinstance(index, self.dumper.Field):
field = index
elif self.dumper.isInt(index):
if self.type.code in (TypeCodeArray, TypeCodePointer):
itemAddress = self.laddress + int(index) * self.type.ltarget.size()
return self.dumper.createValue(itemAddress, self.type.ltarget)
if self.type.code == TypeCodeArray:
addr = self.laddress + int(index) * self.type.ltarget.size()
return self.dumper.createValue(addr, self.type.ltarget)
if self.type.code == TypeCodePointer:
addr = self.pointer() + int(index) * self.type.ltarget.size()
return self.dumper.createValue(addr, self.type.ltarget)
return self.members(False)[index]
else:
error('BAD INDEX TYPE %s' % type(index))

8
share/qtcreator/debugger/misctypes.py
View File

@@ -326,3 +326,11 @@ def qdump__WTF__String(d, value):
def qdump__QtcDumperTest_FieldAccessByIndex(d, value):
d.putValue(value["d"][2].integer())
def qdump__QtcDumperTest_PointerArray(d, value):
foos = value["foos"]
d.putItemCount(10)
if d.isExpanded():
with Children(d, 10):
for i in d.childRange():
d.putSubItem(i, foos[i])

11
tests/auto/debugger/tst_dumpers.cpp
View File

@@ -6412,6 +6412,17 @@ void tst_Dumpers::dumper_data()
"QtcDumperTest_FieldAccessByIndex d; unused(&d);\n")
+ Check("d", "12", "QtcDumperTest_FieldAccessByIndex");
QTest::newRow("Internal2")
<< Data("struct Foo { int bar = 15; }; \n"
"struct QtcDumperTest_PointerArray {\n"
" Foo *foos = new Foo[10];\n"
"};\n\n",
"QtcDumperTest_PointerArray tc; unused(&tc);\n")
+ Check("tc.0.bar", "15", "int")
+ Check("tc.1.bar", "15", "int")
+ Check("tc.2.bar", "15", "int")
+ Check("tc.3.bar", "15", "int");
#if 0
#ifdef Q_OS_LINUX
// Hint: To open a failing test in Creator, do: