Fix gdb support

Author: markshannon

Lib/test/test_gdb/test_backtrace.py

@@ -37,6 +37,8 @@ def test_bt_full(self):
         'Verify that the "py-bt-full" command works'
         bt = self.get_stack_trace(script=SAMPLE_SCRIPT,
                                   cmds_after_breakpoint=['py-bt-full'])
+        print(bt)
+
         self.assertMultilineMatches(bt,
                                     r'''^.*
 #[0-9]+ Frame 0x-?[0-9a-f]+, for file .*gdb_sample.py, line 7, in bar \(a=1, b=2, c=3\)

Tools/gdb/libpython.py

@@ -1115,9 +1115,9 @@ def is_shim(self):
         return self._f_special("owner", int) == FRAME_OWNED_BY_INTERPRETER
 
     def previous(self):
-        prev = self._gdbval["previous"]
+        prev = self._gdbval["previous"].cast(gdb.lookup_type('_PyInterpreterFrame').pointer())
         try:
-            return PyFramePtr(prev["iframe"])
+            return PyFramePtr(prev)
         except:
             return None
 
@@ -1215,11 +1215,11 @@ def write_repr(self, out, visited):
             return
         lineno = self.current_line_num()
         lineno = str(lineno) if lineno is not None else "?"
+        addr = self.as_address()
+        file = self.co_filename.proxyval(visited)
+        name = self.co_name.proxyval(visited)
         out.write('Frame 0x%x, for file %s, line %s, in %s ('
-                  % (self.as_address(),
-                     self.co_filename.proxyval(visited),
-                     lineno,
-                     self.co_name.proxyval(visited)))
+                % (addr, file, lineno, name))
         first = True
         for pyop_name, pyop_value in self.iter_locals():
             if not first:
@@ -1258,7 +1258,6 @@ def get_truncated_repr(self, maxlen):
         except StringTruncated:
             # Truncation occurred:
             return out.getvalue() + '...(truncated)'
-
         # No truncation occurred:
         return out.getvalue()
 
@@ -1869,10 +1868,11 @@ def print_summary(self):
                 interp_frame = interp_frame.previous()
         else:
             info = self.is_other_python_frame()
+            index = self.get_index()
             if info:
-                sys.stdout.write('#%i %s\n' % (self.get_index(), info))
+                sys.stdout.write('#%i %s\n' % (index, info))
             else:
-                sys.stdout.write('#%i\n' % self.get_index())
+                sys.stdout.write('#%i\n' % index)
 
     def print_traceback(self):
         if self.is_evalframe():