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

GH-100126: Skip incomplete frames in more places #100613

Merged
merged 7 commits into from
Jan 9, 2023
+62 −46
Merged

GH-100126: Skip incomplete frames in more places #100613

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5f18200
Add a failing regression test
brandtbucher Dec 29, 2022
4ff833e
fixup
brandtbucher Dec 29, 2022
04b77ac
Add _PyFrame_GetComplete/_PyThreadState_GetFrame
brandtbucher Dec 29, 2022
41c70e6
Clean up how we access/walk the frame stack
brandtbucher Dec 29, 2022
53d066e
blurb add
brandtbucher Dec 29, 2022
eea02f9
Catch up with main
brandtbucher Jan 9, 2023
3c8830b
_PyFrame_GetComplete -> _PyFrame_GetFirstComplete
brandtbucher Jan 9, 2023
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
Add _PyFrame_GetComplete/_PyThreadState_GetFrame
@brandtbucher
brandtbucher committed Dec 29, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
commit 04b77acc91c0214a1d4a1deb4ef76b327b2a2c6b
15 changes: 15 additions & 0 deletions Include/internal/pycore_frame.h
View file
Original file line number Diff line number Diff line change
@@ -153,6 +153,21 @@ _PyFrame_IsIncomplete(_PyInterpreterFrame *frame)
frame->prev_instr < _PyCode_CODE(frame->f_code) + frame->f_code->_co_firsttraceable;
}

static inline _PyInterpreterFrame *
_PyFrame_GetComplete(_PyInterpreterFrame *frame)
Copy link
Member

@markshannon markshannon Jan 5, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This name gives no sense of traversing the stack until a complete frame is found.
Maybe _PyFrame_GetFirstComplete()?

{
while (frame && _PyFrame_IsIncomplete(frame)) {
frame = frame->previous;
}
return frame;
}

static inline _PyInterpreterFrame *
_PyThreadState_GetFrame(PyThreadState *tstate)
{
return _PyFrame_GetComplete(tstate->cframe->current_frame);
}

/* For use by _PyFrame_GetFrameObject
Do not call directly. */
PyFrameObject *