don't track escape in init shim frame

Author: cocolato

Python/optimizer_analysis.c

@@ -491,8 +491,10 @@ optimize_uops(
 
         int oparg = this_instr->oparg;
         opcode = this_instr->opcode;
+        
+        bool was_init_shim = CURRENT_FRAME_IS_INIT_SHIM();
 
-        if (!CURRENT_FRAME_IS_INIT_SHIM()) {
+        if (!was_init_shim) {
             stack_pointer = ctx->frame->stack_pointer;
         }
 
@@ -501,7 +503,7 @@ optimize_uops(
             printf("%4d abs: ", (int)(this_instr - trace));
             _PyUOpPrint(this_instr);
             printf(" \n");
-            if (get_lltrace() >= 5 && !CURRENT_FRAME_IS_INIT_SHIM()) {
+            if (get_lltrace() >= 5 && !was_init_shim) {
                 dump_abstract_stack(ctx->frame, stack_pointer);
             }
         }
@@ -517,16 +519,21 @@ optimize_uops(
                 DPRINTF(1, "\nUnknown opcode in abstract interpreter\n");
                 Py_UNREACHABLE();
         }
+        
+        bool is_init_shim = CURRENT_FRAME_IS_INIT_SHIM();
+        
         // If no ADD_OP was called during this iteration, copy the original instruction
         if (ctx->out_buffer.next == out_ptr) {
             *(ctx->out_buffer.next++) = *this_instr;
         }
-        // Track escapes
-        if (_PyUop_Flags[out_ptr->opcode] & HAS_ESCAPES_FLAG) {
+        // Track escapes - but skip when in/from init shim frame, since self hasn't escaped yet
+        if ((_PyUop_Flags[out_ptr->opcode] & HAS_ESCAPES_FLAG) &&
+            !was_init_shim && !is_init_shim)
+        {
             ctx->last_escape_index = uop_buffer_length(&ctx->out_buffer) - 1;
         }
         assert(ctx->frame != NULL);
-        if (!CURRENT_FRAME_IS_INIT_SHIM() && !ctx->done) {
+        if (!is_init_shim && !ctx->done) {
             DPRINTF(3, " stack_level %d\n", STACK_LEVEL());
             ctx->frame->stack_pointer = stack_pointer;
             assert(STACK_LEVEL() >= 0);