Visitar URL original
[3.12] gh-58933: Make pdb return to caller frame correctly when f_trace is not set (GH-118979) by gaogaotiantian · Pull Request #119008 · python/cpython · GitHub
Skip to content

[3.12] gh-58933: Make pdb return to caller frame correctly when f_trace is not set (GH-118979) #119008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iritkatriel merged 3 commits into from
May 13, 2024
Merged

[3.12] gh-58933: Make pdb return to caller frame correctly when f_trace is not set (GH-118979) #119008

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
966acfe
[3.12] gh-58933: Make pdb return to caller frame correctly when f_tra…
gaogaotiantian May 13, 2024
67003d4
Fix conflict
gaogaotiantian May 13, 2024
9d12f3a
Fix test
gaogaotiantian May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix conflict
  • Loading branch information
@gaogaotiantian
gaogaotiantian committed May 13, 2024
commit 67003d45e8dd6ee90dd3489aaba1737fc5a60577
21 changes: 0 additions & 21 deletions Lib/bdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,9 +290,6 @@ def _set_stopinfo(self, stopframe, returnframe, stoplineno=0):
# stoplineno >= 0 means: stop at line >= the stoplineno
# stoplineno -1 means: don't stop at all
self.stoplineno = stoplineno
<<<<<<< HEAD
=======
self._set_trace_opcodes(opcode)

def _set_caller_tracefunc(self, current_frame):
# Issue #13183: pdb skips frames after hitting a breakpoint and running
Expand All @@ -302,7 +299,6 @@ def _set_caller_tracefunc(self, current_frame):
caller_frame = current_frame.f_back
if caller_frame and not caller_frame.f_trace:
caller_frame.f_trace = self.trace_dispatch
>>>>>>> f526314194... gh-58933: Make pdb return to caller frame correctly when f_trace is not set (#118979)

# Derived classes and clients can call the following methods
# to affect the stepping state.
Expand All @@ -317,25 +313,8 @@ def set_until(self, frame, lineno=None):

def set_step(self):
"""Stop after one line of code."""
<<<<<<< HEAD
# Issue #13183: pdb skips frames after hitting a breakpoint and running
# step commands.
# Restore the trace function in the caller (that may not have been set
# for performance reasons) when returning from the current frame.
if self.frame_returning:
caller_frame = self.frame_returning.f_back
if caller_frame and not caller_frame.f_trace:
caller_frame.f_trace = self.trace_dispatch
self._set_stopinfo(None, None)

=======
self._set_stopinfo(None, None)

def set_stepinstr(self):
"""Stop before the next instruction."""
self._set_stopinfo(None, None, opcode=True)

>>>>>>> f526314194... gh-58933: Make pdb return to caller frame correctly when f_trace is not set (#118979)
def set_next(self, frame):
"""Stop on the next line in or below the given frame."""
self._set_stopinfo(frame, None)
Expand Down