From 93d2e3352c3969a77465ed08b337860474819b13 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 9 Apr 2019 15:26:47 +0200 Subject: [PATCH] Debugger: Improve QObject dumper Don't use two lookups for parent types and act on known null pointers. While the machinery is robust enough to handle the result it's a needless deviation in regular code path. Change-Id: I6e50629cf554870a3ffb9f488f654e6ae557e5b3 Reviewed-by: Christian Stenger --- share/qtcreator/debugger/dumper.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py index 2c66f39a5d1..586df832c07 100644 --- a/share/qtcreator/debugger/dumper.py +++ b/share/qtcreator/debugger/dumper.py @@ -1895,10 +1895,14 @@ class DumperBase: if qobjectPtr: qobjectType = self.createType('QObject') - qobjectPtrType = self.createType('QObject') # FIXME. with SubItem(self, '[parent]'): self.putField('sortgroup', 9) - self.putItem(self.createValue(parentPtr, qobjectPtrType)) + if parentPtr: + self.putItem(self.createValue(parentPtr, qobjectType)) + else: + self.putValue('0x0') + self.putType('QObject *') + self.putNumChild(0) with SubItem(self, '[children]'): self.putField('sortgroup', 8) base = self.extractPointer(dd + 3 * ptrSize) # It's a QList