https://github.com/python/cpython/commit/77ff28bb6776d583e593937df554cbf572cb47b0
commit: 77ff28bb6776d583e593937df554cbf572cb47b0
branch: main
author: Irit Katriel <[email protected]>
committer: iritkatriel <[email protected]>
date: 2024-05-21T17:08:51Z
summary:
gh-109176: replace _PyFrame_OpAlreadyRan by an assertion that the frame is
complete. (#119234)
files:
M Objects/frameobject.c
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 64fded85de1468..fc8d6c7a7aee89 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -1828,32 +1828,6 @@ PyFrame_New(PyThreadState *tstate, PyCodeObject *code,
return f;
}
-static int
-_PyFrame_OpAlreadyRan(_PyInterpreterFrame *frame, int opcode, int oparg)
-{
- // This only works when opcode is a non-quickened form:
- assert(_PyOpcode_Deopt[opcode] == opcode);
- int check_oparg = 0;
- for (_Py_CODEUNIT *instruction = _PyCode_CODE(_PyFrame_GetCode(frame));
- instruction < frame->instr_ptr; instruction++)
- {
- int check_opcode = _PyOpcode_Deopt[instruction->op.code];
- check_oparg |= instruction->op.arg;
- if (check_opcode == opcode && check_oparg == oparg) {
- return 1;
- }
- if (check_opcode == EXTENDED_ARG) {
- check_oparg <<= 8;
- }
- else {
- check_oparg = 0;
- }
- instruction += _PyOpcode_Caches[check_opcode];
- }
- return 0;
-}
-
-
// Initialize frame free variables if needed
static void
frame_init_get_vars(_PyInterpreterFrame *frame)
@@ -1907,14 +1881,9 @@ frame_get_var(_PyInterpreterFrame *frame, PyCodeObject
*co, int i,
value = PyCell_GET(value);
}
else if (kind & CO_FAST_CELL) {
- // Note that no *_DEREF ops can happen before MAKE_CELL
- // executes. So there's no need to duplicate the work
- // that MAKE_CELL would otherwise do later, if it hasn't
- // run yet.
if (value != NULL) {
- if (PyCell_Check(value) &&
- _PyFrame_OpAlreadyRan(frame, MAKE_CELL, i)) {
- // (likely) MAKE_CELL must have executed already.
+ if (PyCell_Check(value)) {
+ assert(!_PyFrame_IsIncomplete(frame));
value = PyCell_GET(value);
}
// (likely) Otherwise it is an arg (kind & CO_FAST_LOCAL),
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
