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

debugger: more robust detection of types with vtables

Browse Source 
Needed to get the "dynamicType" deduction right.

Change-Id: I30ea14f95110fa405abb3a1cb15293d57be87fa3
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-03-02 14:29:57 +01:00
committed by hjk
parent 7a9ed9b72a
commit cce8521c68
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
share/qtcreator/dumper/dumper.py
View File

@@ -89,20 +89,29 @@ def hasInferiorThreadList():
except:
return False
def hasVTable(type):
fields = type.fields()
if len(fields) == 0:
return False
if fields[0].is_base_class:
return hasVTable(fields[0].type)
return str(fields[0].type) == "int (**)(void)"
def dynamicTypeName(value):
#vtbl = str(parseAndEvaluate("{int(*)(int)}%s" % long(value.address)))
try:
# Fails on 7.1 due to the missing to_string.
vtbl = gdb.execute("info symbol {int*}%s" % long(value.address),
to_string = True)
pos1 = vtbl.find("vtable ")
if pos1 != -1:
pos1 += 11
pos2 = vtbl.find(" +", pos1)
if pos2 != -1:
return vtbl[pos1 : pos2]
except:
pass
if hasVTable(value.type):
#vtbl = str(parseAndEvaluate("{int(*)(int)}%s" % long(value.address)))
try:
# Fails on 7.1 due to the missing to_string.
vtbl = gdb.execute("info symbol {int*}%s" % long(value.address),
to_string = True)
pos1 = vtbl.find("vtable ")
if pos1 != -1:
pos1 += 11
pos2 = vtbl.find(" +", pos1)
if pos2 != -1:
return vtbl[pos1 : pos2]
except:
pass
return str(value.type)
def upcast(value):