@@ -537,7 +537,7 @@ add_to_trace(
537537// Reserve space for N uops, plus 3 for _SET_IP, _CHECK_VALIDITY and _EXIT_TRACE
538538#define RESERVE (needed ) RESERVE_RAW((needed) + 3, _PyUOpName(opcode))
539539
540- // Trace stack operations (used by _PUSH_FRAME, _POP_FRAME )
540+ // Trace stack operations (used by _PUSH_FRAME, _RETURN_VALUE )
541541#define TRACE_STACK_PUSH () \
542542 if (trace_stack_depth >= TRACE_STACK_SIZE) { \
543543 DPRINTF(2, "Trace stack overflow\n"); \
@@ -748,10 +748,10 @@ translate_bytecode_to_trace(
748748 int nuops = expansion -> nuops ;
749749 RESERVE (nuops + 1 ); /* One extra for exit */
750750 int16_t last_op = expansion -> uops [nuops - 1 ].uop ;
751- if (last_op == _POP_FRAME || last_op == _RETURN_GENERATOR || last_op == _YIELD_VALUE ) {
751+ if (last_op == _RETURN_VALUE || last_op == _RETURN_GENERATOR || last_op == _YIELD_VALUE ) {
752752 // Check for trace stack underflow now:
753753 // We can't bail e.g. in the middle of
754- // LOAD_CONST + _POP_FRAME .
754+ // LOAD_CONST + _RETURN_VALUE .
755755 if (trace_stack_depth == 0 ) {
756756 DPRINTF (2 , "Trace stack underflow\n" );
757757 OPT_STAT_INC (trace_stack_underflow );
@@ -810,7 +810,7 @@ translate_bytecode_to_trace(
810810 Py_FatalError ("garbled expansion" );
811811 }
812812
813- if (uop == _POP_FRAME || uop == _RETURN_GENERATOR || uop == _YIELD_VALUE ) {
813+ if (uop == _RETURN_VALUE || uop == _RETURN_GENERATOR || uop == _YIELD_VALUE ) {
814814 TRACE_STACK_POP ();
815815 /* Set the operand to the function or code object returned to,
816816 * to assist optimization passes. (See _PUSH_FRAME below.)
@@ -1644,7 +1644,8 @@ _Py_ExecutorClear(_PyExecutorObject *executor)
16441644 _Py_ExecutorDetach (executor );
16451645 Py_DECREF (executor );
16461646 return 0 ;
1647- }]
1647+ }
1648+
16481649static int
16491650executor_clear (_PyExecutorObject * executor )
16501651{
0 commit comments