From: Tom Tromey <tromey@adacore.com>
To: Tom de Vries <tdevries@suse.de>
Cc: Tom Tromey <tromey@adacore.com>,
Tom Tromey via Gdb-patches <gdb-patches@sourceware.org>
Subject: Re: [PATCH] Fix DAP stackTrace through frames without debuginfo
Date: Tue, 14 Mar 2023 07:08:43 -0600 [thread overview]
Message-ID: <873567lbtw.fsf@tromey.com> (raw)
In-Reply-To: <b912f1e7-4518-1c74-e3ce-622291d046f5@suse.de> (Tom de Vries's message of "Thu, 9 Mar 2023 21:35:15 +0100")
Tom> Sorry, yet another error.
Could you try this one instead?
Tom
commit 28705d727f9c90a77a8b7f78b60ac97f010abf48
Author: Tom Tromey <tromey@adacore.com>
Date: Tue Mar 14 07:05:13 2023 -0600
Fix DAP frame bug with older versions of Python
Tom de Vries pointed out that one DAP test failed on Python 3.6
because gdb.Frame is not hashable.
This patch fixes the problem by using a list to hold the frames. This
is less efficient but there normally won't be that many frames.
diff --git a/gdb/python/lib/gdb/dap/frames.py b/gdb/python/lib/gdb/dap/frames.py
index 337bbedae0f..08209d0b361 100644
--- a/gdb/python/lib/gdb/dap/frames.py
+++ b/gdb/python/lib/gdb/dap/frames.py
@@ -18,20 +18,17 @@ import gdb
from .startup import in_gdb_thread
-# Map from frame (thread,level) pair to frame ID numbers. Note we
-# can't use the frame itself here as it is not hashable.
-_frame_ids = {}
-
-# Map from frame ID number back to frames.
-_id_to_frame = {}
+# A list of all the frames we've reported. A frame's index in the
+# list is its ID. We don't use a hash here because frames are not
+# hashable.
+_all_frames = []
# Clear all the frame IDs.
@in_gdb_thread
def _clear_frame_ids(evt):
- global _frame_ids, _id_to_frame
- _frame_ids = {}
- _id_to_frame = {}
+ global _all_frames
+ _all_frames = []
# Clear the frame ID map whenever the inferior runs.
@@ -41,17 +38,17 @@ gdb.events.cont.connect(_clear_frame_ids)
@in_gdb_thread
def frame_id(frame):
"""Return the frame identifier for FRAME."""
- global _frame_ids, _id_to_frame
- pair = (gdb.selected_thread().global_num, frame.level)
- if pair not in _frame_ids:
- id = len(_frame_ids)
- _frame_ids[pair] = id
- _id_to_frame[id] = frame
- return _frame_ids[pair]
+ global _all_frames
+ for i in range(0, len(_all_frames)):
+ if _all_frames[i] == frame:
+ return i
+ result = len(_all_frames)
+ _all_frames.append(frame)
+ return result
@in_gdb_thread
def frame_for_id(id):
"""Given a frame identifier ID, return the corresponding frame."""
- global _id_to_frame
- return _id_to_frame[id]
+ global _all_frames
+ return _all_frames[id]
next prev parent reply other threads:[~2023-03-14 13:08 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-15 19:48 Tom Tromey
2023-03-06 15:17 ` Tom Tromey
2023-03-09 8:38 ` Tom de Vries
2023-03-09 14:24 ` Tom Tromey
2023-03-09 14:52 ` Tom Tromey
2023-03-09 16:10 ` Tom de Vries
2023-03-09 18:45 ` Tom Tromey
2023-03-09 20:35 ` Tom de Vries
2023-03-13 18:46 ` Tom Tromey
2023-03-14 13:08 ` Tom Tromey [this message]
2023-03-14 13:28 ` Tom de Vries
2023-03-14 14:03 ` Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=873567lbtw.fsf@tromey.com \
--to=tromey@adacore.com \
--cc=gdb-patches@sourceware.org \
--cc=tdevries@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).