From e262596dc4a807cb4cb26bb59a41b81fcc98e804 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 5 Apr 2013 13:33:52 +0200 Subject: [PATCH] Debugger: Remove workaround for GDBs with broken parse_and_eval This mostly affected pre-7.2 version which we don't officially support anymore anyways. No need to waste cycles on them. Change-Id: I748cb2be6c5d4161c4129f51809cf3cc358e0be0 Reviewed-by: hjk --- share/qtcreator/dumper/bridge.py | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/share/qtcreator/dumper/bridge.py b/share/qtcreator/dumper/bridge.py index cc82dd3cd53..af91e619653 100644 --- a/share/qtcreator/dumper/bridge.py +++ b/share/qtcreator/dumper/bridge.py @@ -112,28 +112,8 @@ try: Command() - - def isGoodGdb(): - #return gdb.VERSION.startswith("6.8.50.2009") \ - # and gdb.VERSION != "6.8.50.20090630-cvs" - return 'parse_and_eval' in __builtin__.dir(gdb) - - def parseAndEvaluate(exp): - if isGoodGdb(): - return gdb.parse_and_eval(exp) - # Work around non-existing gdb.parse_and_eval as in released 7.0 -# gdb.execute("set logging redirect on") - gdb.execute("set logging on") - try: - gdb.execute("print %s" % exp) - except: - gdb.execute("set logging off") -# gdb.execute("set logging redirect off") - return None - gdb.execute("set logging off") -# gdb.execute("set logging redirect off") - return gdb.history(0) + return gdb.parse_and_eval(exp) def extractFields(value): return value.type.fields() @@ -179,7 +159,7 @@ try: items = [] #warn("HAS BLOCK: %s" % hasBlock) - if hasBlock and isGoodGdb(): + if hasBlock: #warn("IS GOOD: %s " % varList) try: block = frame.block()