https://github.com/python/cpython/commit/12eaadc0ad33411bb02945d700b6ed7e758bb188
commit: 12eaadc0ad33411bb02945d700b6ed7e758bb188
branch: main
author: Tian Gao <[email protected]>
committer: gaogaotiantian <[email protected]>
date: 2024-10-15T15:56:33-04:00
summary:
gh-58956: Set f_trace on frames with breakpoints after setting a new breakpoint
(#124454)
files:
A Misc/NEWS.d/next/Library/2024-09-24-18-16-59.gh-issue-58956.0wFrBR.rst
M Lib/bdb.py
M Lib/test/test_pdb.py
diff --git a/Lib/bdb.py b/Lib/bdb.py
index 9755d61dd2696c..81bba8a130f97c 100644
--- a/Lib/bdb.py
+++ b/Lib/bdb.py
@@ -461,6 +461,14 @@ def set_break(self, filename, lineno, temporary=False,
cond=None,
return 'Line %s:%d does not exist' % (filename, lineno)
self._add_to_breaks(filename, lineno)
bp = Breakpoint(filename, lineno, temporary, cond, funcname)
+ # After we set a new breakpoint, we need to search through all frames
+ # and set f_trace to trace_dispatch if there could be a breakpoint in
+ # that frame.
+ frame = self.enterframe
+ while frame:
+ if self.break_anywhere(frame):
+ frame.f_trace = self.trace_dispatch
+ frame = frame.f_back
return None
def _load_breaks(self):
diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py
index 456effc010954a..8136c591a33001 100644
--- a/Lib/test/test_pdb.py
+++ b/Lib/test/test_pdb.py
@@ -3396,6 +3396,36 @@ def test_issue26053(self):
self.assertRegex(res, "Restarting .* with arguments:\na b c")
self.assertRegex(res, "Restarting .* with arguments:\nd e f")
+ def test_issue58956(self):
+ # Set a breakpoint in a function that already exists on the call stack
+ # should enable the trace function for the frame.
+ script = """
+ import bar
+ def foo():
+ ret = bar.bar()
+ pass
+ foo()
+ """
+ commands = """
+ b bar.bar
+ c
+ b main.py:5
+ c
+ p ret
+ quit
+ """
+ bar = """
+ def bar():
+ return 42
+ """
+ with open('bar.py', 'w') as f:
+ f.write(textwrap.dedent(bar))
+ self.addCleanup(os_helper.unlink, 'bar.py')
+ stdout, stderr = self.run_pdb_script(script, commands)
+ lines = stdout.splitlines()
+ self.assertIn('-> pass', lines)
+ self.assertIn('(Pdb) 42', lines)
+
def test_step_into_botframe(self):
# gh-125422
# pdb should not be able to step into the botframe (bdb.py)
diff --git
a/Misc/NEWS.d/next/Library/2024-09-24-18-16-59.gh-issue-58956.0wFrBR.rst
b/Misc/NEWS.d/next/Library/2024-09-24-18-16-59.gh-issue-58956.0wFrBR.rst
new file mode 100644
index 00000000000000..a882a632fddf1b
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-09-24-18-16-59.gh-issue-58956.0wFrBR.rst
@@ -0,0 +1 @@
+Fixed a bug in :mod:`pdb` where sometimes the breakpoint won't trigger if it
was set on a function which is already in the call stack.
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
