Skip to content

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

Merged
iritkatriel merged 2 commits into
python:mainfrom
gaogaotiantian:pdb-trace-missing
May 13, 2024
Merged

gh-58933: Make pdb return to caller frame correctly when f_trace is not set#118979
iritkatriel merged 2 commits into
python:mainfrom
gaogaotiantian:pdb-trace-missing

Conversation

@gaogaotiantian

@gaogaotiantiangaogaotiantian commented May 12, 2024•
edited by bedevere-app Bot
Loading

Copy link
Copy Markdown
Member

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-appbedevere-appBot mentioned this pull request May 12, 2024
Closed
@gaogaotiantiangaogaotiantian added 3.12 only security fixes 3.13 bugs and security fixes labels May 12, 2024
@iritkatriel
iritkatriel merged commit f526314 into python:mainMay 13, 2024
@gaogaotiantian

gaogaotiantian commented May 13, 2024

Copy link
Copy Markdown
MemberAuthor

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

@iritkatrieliritkatriel added the needs backport to 3.12 only security fixes label May 13, 2024
@miss-islington-app

miss-islington-appBot commented May 13, 2024

Copy link
Copy Markdown

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

@miss-islington-app

miss-islington-appBot commented May 13, 2024

Copy link
Copy Markdown

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

gaogaotiantian commented May 13, 2024

Copy link
Copy Markdown
MemberAuthor

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

@gaogaotiantian

gaogaotiantian commented May 13, 2024

Copy link
Copy Markdown
MemberAuthor

And I'll work on the cherry pick.

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

miss-islington-appBot commented May 13, 2024

Copy link
Copy Markdown

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

bedevere-appBot commented May 13, 2024

Copy link
Copy Markdown

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

@bedevere-appbedevere-appBot removed the needs backport to 3.13 bugs and security fixes label May 13, 2024
@bedevere-app

bedevere-appBot commented May 13, 2024

Copy link
Copy Markdown

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

@bedevere-appbedevere-appBot removed the needs backport to 3.12 only 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>
@JelleZijlstraJelleZijlstra 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)
@gaogaotiantiangaogaotiantian mentioned this pull request Oct 4, 2024
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@iritkatrieliritkatrieliritkatriel approved these changes

Assignees

@iritkatrieliritkatriel

Labels

3.12only security fixes3.13bugs and security fixes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@gaogaotiantian@iritkatriel