From 75be7de6f4ba4db231a347f4cefa793427ec5502 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 10 Nov 2016 21:28:23 +0100 Subject: [PATCH] Debugger: Make dynamic type lookup more robust ... in builds without debug information. Change-Id: I3842736aebe5b7c6b46d0ea1eec540dc3c088920 Reviewed-by: hjk --- share/qtcreator/debugger/gdbbridge.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/qtcreator/debugger/gdbbridge.py b/share/qtcreator/debugger/gdbbridge.py index 93e061b7ede..255c40a32e2 100644 --- a/share/qtcreator/debugger/gdbbridge.py +++ b/share/qtcreator/debugger/gdbbridge.py @@ -1068,6 +1068,8 @@ class Dumper(DumperBase): def nativeDynamicTypeName(self, address, baseType): # Needed for Gdb13393 test. nativeType = self.lookupNativeType(baseType.name) + if nativeType is None: + return None nativeTypePointer = nativeType.pointer() nativeValue = gdb.Value(address).cast(nativeTypePointer).dereference() val = nativeValue.cast(nativeValue.dynamic_type) @@ -1088,6 +1090,8 @@ class Dumper(DumperBase): def nativeDynamicType(self, address, baseType): # Needed for Gdb13393 test. nativeType = self.lookupNativeType(baseType.name) + if nativeType is None: + return baseType nativeTypePointer = nativeType.pointer() nativeValue = gdb.Value(address).cast(nativeTypePointer).dereference() return self.fromNativeType(nativeValue.dynamic_type)