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

Dumper: Adapt to Id that moved from Core to Utils

Browse Source 
Change-Id: I6437d813234dc22923a313d540f115e070edeba7
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Orgad Shaneh
2020-07-03 11:36:55 +03:00
committed by Orgad Shaneh
parent 11a7ccb865
commit e3312205ed
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
share/qtcreator/debugger/cdbbridge.py
View File

@@ -514,7 +514,10 @@ class Dumper(DumperBase):
raise Exception("cdb does not support calling functions") raise Exception("cdb does not support calling functions")
def nameForCoreId(self, id): def nameForCoreId(self, id):
idName = cdbext.call('Cored4!Core::nameForId(%d)' % id) for dll in ['Utilsd4', 'Utils4']:
idName = cdbext.call('%s!Utils::nameForId(%d)' % (dll, id))
if idName is not None:
break
return self.fromNativeValue(idName) return self.fromNativeValue(idName)
def putCallItem(self, name, rettype, value, func, *args): def putCallItem(self, name, rettype, value, func, *args):

4
share/qtcreator/debugger/creatortypes.py
View File

@@ -90,13 +90,13 @@ def dumpLiteral(d, value):
d.putValue(d.hexencode(readLiteral(d, value)), "latin1") d.putValue(d.hexencode(readLiteral(d, value)), "latin1")
def qdump__Core__Id(d, value): def qdump__Utils__Id(d, value):
val = value.extractPointer() val = value.extractPointer()
if True: if True:
if d.isMsvcTarget(): if d.isMsvcTarget():
name = d.nameForCoreId(val).address() name = d.nameForCoreId(val).address()
else: else:
name = d.parseAndEvaluate("Core::nameForId(0x%x)" % val).pointer() name = d.parseAndEvaluate("Utils::nameForId(0x%x)" % val).pointer()
d.putSimpleCharArray(name) d.putSimpleCharArray(name)
else: else:
d.putValue(val) d.putValue(val)