fix escape && add _STORE_ATTR_INSTANCE_VALUE_NULL

Author: cocolato

Include/internal/pycore_uop_ids.h

@@ -2671,6 +2671,23 @@ dummy_func(
             Py_XDECREF(old_value);
         }
 
+        op(_STORE_ATTR_INSTANCE_VALUE_NULL, (offset/1, value, owner -- o)) {
+            PyObject *owner_o = PyStackRef_AsPyObjectBorrow(owner);
+
+            STAT_INC(STORE_ATTR, hit);
+            assert(_PyObject_GetManagedDict(owner_o) == NULL);
+            PyObject **value_ptr = (PyObject**)(((char *)owner_o) + offset);
+            PyObject *old_value = *value_ptr;
+            DEOPT_IF(old_value != NULL);
+            FT_ATOMIC_STORE_PTR_RELEASE(*value_ptr, PyStackRef_AsPyObjectSteal(value));
+            PyDictValues *values = _PyObject_InlineValues(owner_o);
+            Py_ssize_t index = value_ptr - values->values;
+            _PyDictValues_AddToInsertionOrder(values, index);
+            UNLOCK_OBJECT(owner_o);
+            INPUTS_DEAD();
+            o = owner;
+        }
+
         macro(STORE_ATTR_INSTANCE_VALUE) =
             unused/1 +
             _GUARD_TYPE_VERSION_AND_LOCK +

Include/internal/pycore_uop_metadata.h

@@ -506,9 +506,7 @@ optimize_uops(
 
         int oparg = this_instr->oparg;
         opcode = this_instr->opcode;
-        bool was_init_shim = CURRENT_FRAME_IS_INIT_SHIM();
-
-        if (!was_init_shim) {
+        if (!CURRENT_FRAME_IS_INIT_SHIM()) {
             stack_pointer = ctx->frame->stack_pointer;
         }
 
@@ -524,14 +522,13 @@ 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 - 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)
+        // Track escapes - but skip when from init shim frame, since self hasn't escaped yet
+        bool is_init_shim = CURRENT_FRAME_IS_INIT_SHIM();
+        if ((_PyUop_Flags[out_ptr->opcode] & HAS_ESCAPES_FLAG) && !is_init_shim)
         {
             ctx->last_escape_index = uop_buffer_length(&ctx->out_buffer) - 1;
         }

Python/bytecodes.c

@@ -106,6 +106,14 @@ dummy_func(void) {
     }
 
     op(_STORE_ATTR_INSTANCE_VALUE, (offset/1, value, owner -- o)) {
+        JitOptRef old_value = sym_set_attr(ctx, owner, (uint16_t)offset, value);
+        if (sym_is_null(old_value)) {
+            ADD_OP(_STORE_ATTR_INSTANCE_VALUE_NULL, 0, offset);
+        }
+        o = owner;
+    }
+
+    op(_STORE_ATTR_INSTANCE_VALUE_NULL, (offset/1, value, owner -- o)) {
         (void)value;
         o = owner;
     }
@@ -135,6 +143,11 @@ dummy_func(void) {
         o = owner;
     }
 
+    op(_STORE_ATTR_SLOT_NULL, (index/1, value, owner -- o)) {
+        (void)value;
+        o = owner;
+    }
+
     op(_STORE_SUBSCR_DICT, (value, dict_st, sub -- st)) {
         (void)value;
         st = dict_st;
@@ -941,7 +954,7 @@ dummy_func(void) {
         (void)args;
         callable = sym_new_not_null(ctx);
         PyTypeObject *tp = _PyType_LookupByVersion(type_version);
-        if (tp != NULL && tp->tp_basicsize > sizeof(PyObject) && !(tp->tp_flags & Py_TPFLAGS_MANAGED_DICT)) {
+        if (tp != NULL) {
             self_or_null = sym_new_descr_object(ctx, type_version);
         } else {
             self_or_null = sym_new_not_null(ctx);