Skip to content
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

Jump to bottom

gh-58933: Make pdb return to caller frame correctly when f_trace is not set #118979

Merged
merged 2 commits into from
May 13, 2024
Merged

gh-58933: Make pdb return to caller frame correctly when f_trace is not set #118979

merged 2 commits into from
May 13, 2024

Conversation

gaogaotiantian
Copy link
Member

@gaogaotiantian gaogaotiantian commented May 12, 2024 •
edited by bedevere-app bot
Loading

For commands like next, return, until on a return event, if f_trace of the previous frame is not set, the command will not stop at the previous frame. A similar issue is fixed for step, we are generalizing that fix to commands other than continue.

@bedevere-app bedevere-app bot mentioned this pull request May 12, 2024
Closed
@gaogaotiantian gaogaotiantian added 3.12 bugs and security fixes 3.13 bugs and security fixes labels May 12, 2024
@iritkatriel iritkatriel merged commit f526314 into python:main May 13, 2024
37 checks passed
@gaogaotiantian
Copy link
Member Author

Hi @iritkatriel , this is a bug fix (a rather important one I think) and maybe it should be backported?

@iritkatriel iritkatriel added the needs backport to 3.12 bug and security fixes label May 13, 2024
@miss-islington-app
Copy link

Thanks @gaogaotiantian for the PR, and @iritkatriel for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖

@miss-islington-app
Copy link

Sorry, @gaogaotiantian and @iritkatriel, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker f526314194f7fd15931025f8a4439c1765666e42 3.12

@gaogaotiantian
Copy link
Member Author

As main is 3.14 now, we should probably need to backport to 3.13 too?

@gaogaotiantian
Copy link
Member Author

And I'll work on the cherry pick.

@iritkatriel iritkatriel added the needs backport to 3.13 bugs and security fixes label May 13, 2024
@miss-islington-app
Copy link

Thanks @gaogaotiantian for the PR, and @iritkatriel for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request May 13, 2024
@gaogaotiantian @miss-islington
pythongh-58933: Make pdb return to caller frame correctly when f_trac…
e8a17fc 
…e is not set (pythonGH-118979)

(cherry picked from commit f526314)

Co-authored-by: Tian Gao <gaogaotiantian@hotmail.com>
@bedevere-app
Copy link

bedevere-app bot commented May 13, 2024

GH-119007 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label May 13, 2024
@bedevere-app
Copy link

bedevere-app bot commented May 13, 2024

GH-119008 is a backport of this pull request to the 3.12 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.12 bug and security fixes label May 13, 2024
@gaogaotiantian gaogaotiantian deleted the pdb-trace-missing branch May 13, 2024 18:17
iritkatriel pushed a commit that referenced this pull request May 13, 2024
@miss-islington @gaogaotiantian
[3.13] gh-58933: Make pdb return to caller frame correctly when f_tra…
09d4c07 
…ce is not set (GH-118979) (#119007)

gh-58933: Make pdb return to caller frame correctly when f_trace is not set (GH-118979)
(cherry picked from commit f526314)

Co-authored-by: Tian Gao <gaogaotiantian@hotmail.com>
iritkatriel pushed a commit that referenced this pull request May 13, 2024
@gaogaotiantian
[3.12] gh-58933: Make pdb return to caller frame correctly when f_tra…
fcdd20e 
…ce is not set (GH-118979) (#119008)

* [3.12] gh-58933: Make pdb return to caller frame correctly when f_trace is not set (GH-118979)
(cherry picked from commit f526314)

Co-authored-by: Tian Gao <gaogaotiantian@hotmail.com>
@JelleZijlstra JelleZijlstra mentioned this pull request May 28, 2024
Closed
estyxx pushed a commit to estyxx/cpython that referenced this pull request Jul 17, 2024
@gaogaotiantian @estyxx
pythongh-58933: Make pdb return to caller frame correctly when f_trac…
0edb826 
…e is not set (python#118979)
@gaogaotiantian gaogaotiantian mentioned this pull request Oct 4, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@iritkatriel iritkatriel iritkatriel approved these changes

Assignees

@iritkatriel iritkatriel

Labels
3.12 bugs and security fixes 3.13 bugs and security fixes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@gaogaotiantian @iritkatriel