Skip to content

Commit fda19f4

Browse files
partial fix (waiting for python#129112 )
1 parent aa1a5f6 commit fda19f4

File tree

6 files changed

+92
-65
lines changed

6 files changed

+92
-65
lines changed

Include/internal/pycore_frame.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,6 @@ _PyFrame_Initialize(
220220
frame->localsplus[i] = PyStackRef_NULL;
221221
}
222222

223-
frame->is_entry_frame = 0;
224-
225223
#ifdef Py_GIL_DISABLED
226224
// On GIL disabled, we walk the entire stack in GC. Since stacktop
227225
// is not always in sync with the real stack pointer, we have
@@ -402,8 +400,6 @@ _PyFrame_PushTrampolineUnchecked(PyThreadState *tstate, PyCodeObject *code, int
402400
frame->visited = 0;
403401
frame->return_offset = 0;
404402

405-
frame->is_entry_frame = 0;
406-
407403
#ifdef Py_GIL_DISABLED
408404
assert(code->co_nlocalsplus == 0);
409405
for (int i = 0; i < code->co_stacksize; i++) {

Python/ceval_macros.h

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -307,13 +307,14 @@ GETITEM(PyObject *v, Py_ssize_t i) {
307307
#endif
308308

309309
#ifdef Py_TAIL_CALL_INTERP
310-
if ((COND)) { \
311-
/* This is only a single jump on release builds! */ \
312-
UPDATE_MISS_STATS((INSTNAME)); \
313-
assert(_PyOpcode_Deopt[opcode] == (INSTNAME)); \
314-
Py_MUSTTAIL \
315-
return (INSTRUCTION_TABLE[op])(frame, stack_pointer, tstate, next_instr - 1 - size, opcode, oparg); \
316-
}
310+
# define DEOPT_IF(COND, INSTNAME, SIZE) \
311+
if ((COND)) { \
312+
/* This is only a single jump on release builds! */ \
313+
UPDATE_MISS_STATS((INSTNAME)); \
314+
assert(_PyOpcode_Deopt[opcode] == (INSTNAME)); \
315+
Py_MUSTTAIL \
316+
return (INSTRUCTION_TABLE[op])(frame, stack_pointer, tstate, next_instr - 1 - size, opcode, oparg); \
317+
}
317318
#else
318319
# define DEOPT_IF(COND, INSTNAME, SIZE) \
319320
if ((COND)) { \

Python/generated_cases.c.h

Lines changed: 20 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)