From 4cb4b7ba993575ce43e0786454625501012d5500 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Fri, 30 Nov 2018 01:25:17 +0200 Subject: [PATCH] GDB: Fix address resolving for typedefed types Reported upstream: https://sourceware.org/bugzilla/show_bug.cgi?id=23936 Fixes: QTCREATORBUG-21602 Change-Id: I0592679a6b5c4821175ef8e97e2206e0ac0be44d Reviewed-by: hjk --- share/qtcreator/debugger/gdbbridge.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/share/qtcreator/debugger/gdbbridge.py b/share/qtcreator/debugger/gdbbridge.py index cdde71b3ff3..c6e6adc55fe 100644 --- a/share/qtcreator/debugger/gdbbridge.py +++ b/share/qtcreator/debugger/gdbbridge.py @@ -246,17 +246,13 @@ class Dumper(DumperBase): #warn('TARGET TYPE: %s' % targetType) if targetType.code == gdb.TYPE_CODE_ARRAY: val = self.Value(self) - val.laddress = toInteger(nativeValue.address) - val.nativeValue = nativeValue else: # Cast may fail (e.g for arrays, see test for Bug5799) val = self.fromNativeValue(nativeValue.cast(targetType)) - val.type = self.fromNativeType(nativeType) - val.nativeValue = nativeValue #warn('CREATED TYPEDEF: %s' % val) - return val + else: + val = self.Value(self) - val = self.Value(self) val.nativeValue = nativeValue if not nativeValue.address is None: val.laddress = toInteger(nativeValue.address)