Skip to content

Commit

Permalink
Remove asserts that confuse enum _framestate with enum _frameowner (
Browse files Browse the repository at this point in the history
GH-124148)

The `owner` field of `_PyInterpreterFrame` is supposed to be a member of
`enum _frameowner`, but `FRAME_CLEARED` is a member of `enum _framestate`.

At present, it happens that `FRAME_CLEARED` is not numerically equal to any
member of `enum _frameowner`, but that could change in the future. The code
that incorrectly assigned `owner = FRAME_CLEARED` was deleted in commit
a53cc3f (GH-116687). Remove the incorrect
checks for `owner != FRAME_CLEARED` as well.
  • Loading branch information
andersk authored Jan 2, 2025
1 parent 58e9f95 commit a626f9a
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions Python/frame.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ _PyFrame_MakeAndSetFrameObject(_PyInterpreterFrame *frame)
// here.
assert(frame->frame_obj == NULL);
assert(frame->owner != FRAME_OWNED_BY_FRAME_OBJECT);
assert(frame->owner != FRAME_CLEARED);
f->f_frame = frame;
frame->frame_obj = f;
return f;
Expand All @@ -51,7 +50,6 @@ take_ownership(PyFrameObject *f, _PyInterpreterFrame *frame)
{
assert(frame->owner != FRAME_OWNED_BY_CSTACK);
assert(frame->owner != FRAME_OWNED_BY_FRAME_OBJECT);
assert(frame->owner != FRAME_CLEARED);
Py_ssize_t size = ((char*)frame->stackpointer) - (char *)frame;
memcpy((_PyInterpreterFrame *)f->_f_frame_data, frame, size);
frame = (_PyInterpreterFrame *)f->_f_frame_data;
Expand Down

0 comments on commit a626f9a

Please sign in to comment.