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

Debugger: Add yet another virtual inheritance test

Browse Source 
Failing for now.

Change-Id: Ic624b9c64f85f06bf61a2e8f765a272a835c0c43
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-09-15 08:03:09 +02:00
parent 4f03ea96a2
commit fe1cbd0f87
2 changed files with 49 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -406,31 +406,6 @@ def qdump__QtcDumperTest_List(d, value):
d.putFields(value) d.putFields(value)
#d.putPlainChildren(value) #d.putPlainChildren(value)
def qdump__QtcDumperTest_List__NodeX(d, value):
typename = value.type.unqualified().name
pos0 = typename.find('<')
pos1 = typename.find('>')
tName = typename[pos0+1:pos1]
d.putBetterType('QtcDumperTest_List<' + tName + '>::Node')
d.putNumChild(1)
if d.isExpanded():
obj_type = d.lookupType(tName)
with Children(d):
d.putSubItem("this", value.cast(obj_type))
d.putFields(value)
#d.putPlainChildren(value)
def qdump__QtcDumperTest_List(d, value):
innerType = value.type[0]
d.putNumChild(1)
p = value['root']
if d.isExpanded():
with Children(d):
d.putSubItem("[p]", p)
d.putSubItem("[root]", value["root"].cast(innerType))
d.putFields(value)
#d.putPlainChildren(value)
def qdump__QtcDumperTest_String(d, value): def qdump__QtcDumperTest_String(d, value):
with Children(d): with Children(d):
first = d.hexdecode(d.putSubItem('first', value['first']).value) first = d.hexdecode(d.putSubItem('first', value['first']).value)

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

@@ -6834,6 +6834,55 @@ void tst_Dumpers::dumper_data()
+ Check("s.storage_.@1.size_", "4", "int"); + Check("s.storage_.@1.size_", "4", "int");
QTest::newRow("Internal4")
<< Data("template<class T>\n"
"struct QtcDumperTest_List\n"
"{\n"
" struct Node\n"
" {\n"
" virtual ~Node() {}\n"
" Node *prev = nullptr;\n"
" Node *next = nullptr;\n"
" };\n\n"
" QtcDumperTest_List()\n"
" {\n"
" root.prev = &root;\n"
" root.next = &root;\n"
" }\n\n"
" void insert(Node *n)\n"
" {\n"
" if (n->next)\n"
" return;\n"
" Node *r = root.prev;\n"
" Node *node = r->next;\n"
" n->next = node;\n"
" node->prev = n;\n"
" r->next = n;\n"
" n->prev = r;\n"
" }\n"
" Node root;\n"
"};\n\n"
"struct Base\n"
"{\n"
" virtual ~Base() {}\n"
" int foo = 42;\n"
"};\n\n"
"struct Derived : Base, QtcDumperTest_List<Derived>::Node\n"
"{\n"
" int baz = 84;\n"
"};\n\n",
"Derived d1, d2; unused(&d1, &d2);\n"
"QtcDumperTest_List<Derived> list; unused(&list);\n"
"list.insert(&d1);\n"
"list.insert(&d2);\n")
+ Cxx11Profile()
+ Check("d1.@1.foo", "42", "int")
+ Check("d1.baz", "84", "int")
+ Check("d2.@1.foo", "42", "int")
+ Check("d2.baz", "84", "int")
//+ Check("list.1.baz", "15", "int")
;
QTest::newRow("BufArray") QTest::newRow("BufArray")
<< Data("#include <new>\n" << Data("#include <new>\n"
"static int c = 0;\n" "static int c = 0;\n"