forked from qt-creator/qt-creator
Debugger: Allow gdb inferior calls for symbol address finding
Amends a9e8b106a4
, otherwise Qt version discovery breaks.
Change-Id: I2b682935e4e5783328fc43840681b988306c6cc5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -965,6 +965,9 @@ class DumperBase():
|
|||||||
raise error
|
raise error
|
||||||
children = [('error', error)]
|
children = [('error', error)]
|
||||||
self.putSpecialValue("notcallable", children=children)
|
self.putSpecialValue("notcallable", children=children)
|
||||||
|
else:
|
||||||
|
if result is None:
|
||||||
|
self.putSpecialValue("notcallable")
|
||||||
else:
|
else:
|
||||||
self.putItem(result)
|
self.putItem(result)
|
||||||
|
|
||||||
|
@@ -737,11 +737,11 @@ class Dumper(DumperBase):
|
|||||||
return None if val is None else self.fromNativeValue(val)
|
return None if val is None else self.fromNativeValue(val)
|
||||||
|
|
||||||
def nativeParseAndEvaluate(self, exp):
|
def nativeParseAndEvaluate(self, exp):
|
||||||
#self.warn('EVALUATE "%s"' % exp)
|
# FIXME: This breaks symbol discovery
|
||||||
try:
|
|
||||||
if not self.allowInferiorCalls:
|
if not self.allowInferiorCalls:
|
||||||
return None
|
return None
|
||||||
|
#self.warn('EVALUATE "%s"' % exp)
|
||||||
|
try:
|
||||||
val = gdb.parse_and_eval(exp)
|
val = gdb.parse_and_eval(exp)
|
||||||
return val
|
return val
|
||||||
except RuntimeError as error:
|
except RuntimeError as error:
|
||||||
@@ -1041,6 +1041,10 @@ class Dumper(DumperBase):
|
|||||||
except:
|
except:
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
|
def symbolAddress(self, symbolName):
|
||||||
|
res = self.findSymbol(symbolName)
|
||||||
|
return res
|
||||||
|
|
||||||
def handleNewObjectFile(self, objfile):
|
def handleNewObjectFile(self, objfile):
|
||||||
name = objfile.filename
|
name = objfile.filename
|
||||||
if self.isWindowsTarget():
|
if self.isWindowsTarget():
|
||||||
|
Reference in New Issue
Block a user