feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Fix warn() calls in LLDB bridge

Browse Source 
Change-Id: I7e8a571daae6a81efb52e153c8b19e724aa56c55
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2014-09-22 18:00:06 +02:00
parent 03304fe29f
commit 245d4b253d
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
share/qtcreator/debugger/lldbbridge.py
View File

@@ -368,12 +368,12 @@ class Dumper(DumperBase):
def callHelper(self, value, func, args): def callHelper(self, value, func, args):
# args is a tuple. # args is a tuple.
arg = ','.join(args) arg = ','.join(args)
#warn("CALL: %s -> %s(%s)" % (value, func, arg)) #self.warn("CALL: %s -> %s(%s)" % (value, func, arg))
type = value.type.name type = value.type.name
exp = "((%s*)%s)->%s(%s)" % (type, value.address, func, arg) exp = "((%s*)%s)->%s(%s)" % (type, value.address, func, arg)
#warn("CALL: %s" % exp) #self.warn("CALL: %s" % exp)
result = value.CreateValueFromExpression('', exp) result = value.CreateValueFromExpression('', exp)
#warn(" -> %s" % result) #self.warn(" -> %s" % result)
return result return result
def makeValue(self, type, *args): def makeValue(self, type, *args):
@@ -381,9 +381,9 @@ class Dumper(DumperBase):
frame = thread.GetFrameAtIndex(0) frame = thread.GetFrameAtIndex(0)
inner = ','.join(args) inner = ','.join(args)
value = frame.EvaluateExpression(type + '{' + inner + '}') value = frame.EvaluateExpression(type + '{' + inner + '}')
#warn(" TYPE: %s" % value.type) #self.warn(" TYPE: %s" % value.type)
#warn(" ADDR: 0x%x" % value.address) #self.warn(" ADDR: 0x%x" % value.address)
#warn(" VALUE: %s" % value) #self.warn(" VALUE: %s" % value)
return value return value
def parseAndEvaluate(self, expr): def parseAndEvaluate(self, expr):
@@ -550,7 +550,7 @@ class Dumper(DumperBase):
return self.isKnownMovableType(self.stripNamespaceFromType(type.GetName())) return self.isKnownMovableType(self.stripNamespaceFromType(type.GetName()))
def putNumChild(self, numchild): def putNumChild(self, numchild):
#warn("NUM CHILD: '%s' '%s'" % (numchild, self.currentChildNumChild)) #self.warn("NUM CHILD: '%s' '%s'" % (numchild, self.currentChildNumChild))
#if numchild != self.currentChildNumChild: #if numchild != self.currentChildNumChild:
self.put('numchild="%s",' % numchild) self.put('numchild="%s",' % numchild)
@@ -610,13 +610,13 @@ class Dumper(DumperBase):
return re.sub('\\bconst\\b', '', name).replace(' ', '') return re.sub('\\bconst\\b', '', name).replace(' ', '')
def lookupType(self, name): def lookupType(self, name):
#warn("LOOKUP TYPE NAME: %s" % name) #self.warn("LOOKUP TYPE NAME: %s" % name)
if name.endswith('*'): if name.endswith('*'):
typeobj = self.lookupType(name[:-1].strip()) typeobj = self.lookupType(name[:-1].strip())
return typeobj.GetPointerType() if type.IsValid() else None return typeobj.GetPointerType() if type.IsValid() else None
typeobj = self.target.FindFirstType(name) typeobj = self.target.FindFirstType(name)
#warn("LOOKUP RESULT: %s" % typeobj.name) #self.warn("LOOKUP RESULT: %s" % typeobj.name)
#warn("LOOKUP VALID: %s" % typeobj.IsValid()) #self.warn("LOOKUP VALID: %s" % typeobj.IsValid())
if typeobj.IsValid(): if typeobj.IsValid():
return typeobj return typeobj
try: try:
@@ -1029,7 +1029,7 @@ class Dumper(DumperBase):
self.putQObjectGuts(value, staticMetaObject) self.putQObjectGuts(value, staticMetaObject)
def warn(self, msg): def warn(self, msg):
self.put('{name="%s",value="",type=""},' % msg) self.put('{name="%s",value="",type="",numchild="0"},' % msg)
def putFields(self, value): def putFields(self, value):
# Suppress printing of 'name' field for arrays. # Suppress printing of 'name' field for arrays.