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:
@@ -966,7 +966,10 @@ class DumperBase():
|
||||
children = [('error', error)]
|
||||
self.putSpecialValue("notcallable", children=children)
|
||||
else:
|
||||
self.putItem(result)
|
||||
if result is None:
|
||||
self.putSpecialValue("notcallable")
|
||||
else:
|
||||
self.putItem(result)
|
||||
|
||||
def call(self, rettype, value, func, *args):
|
||||
return self.callHelper(rettype, value, func, args)
|
||||
|
@@ -737,11 +737,11 @@ class Dumper(DumperBase):
|
||||
return None if val is None else self.fromNativeValue(val)
|
||||
|
||||
def nativeParseAndEvaluate(self, exp):
|
||||
# FIXME: This breaks symbol discovery
|
||||
if not self.allowInferiorCalls:
|
||||
return None
|
||||
#self.warn('EVALUATE "%s"' % exp)
|
||||
try:
|
||||
if not self.allowInferiorCalls:
|
||||
return None
|
||||
|
||||
val = gdb.parse_and_eval(exp)
|
||||
return val
|
||||
except RuntimeError as error:
|
||||
@@ -1041,6 +1041,10 @@ class Dumper(DumperBase):
|
||||
except:
|
||||
return 0
|
||||
|
||||
def symbolAddress(self, symbolName):
|
||||
res = self.findSymbol(symbolName)
|
||||
return res
|
||||
|
||||
def handleNewObjectFile(self, objfile):
|
||||
name = objfile.filename
|
||||
if self.isWindowsTarget():
|
||||
|
Reference in New Issue
Block a user