add _STORE_ATTR_SLOT_NULL && rename

Author: cocolato

Include/internal/pycore_optimizer.h

@@ -37,8 +37,8 @@ typedef struct _JitOptContext {
     // Arena for the symbolic types.
     ty_arena t_arena;
 
-    // Arena for the slots mappings.
-    slots_arena s_arena;
+    // Arena for the descriptor mappings.
+    descr_arena d_arena;
 
     JitOptRef *n_consumed;
     JitOptRef *limit;
@@ -300,9 +300,9 @@ extern JitOptRef _Py_uop_sym_new_truthiness(JitOptContext *ctx, JitOptRef value,
 extern bool _Py_uop_sym_is_compact_int(JitOptRef sym);
 extern JitOptRef _Py_uop_sym_new_compact_int(JitOptContext *ctx);
 extern void _Py_uop_sym_set_compact_int(JitOptContext *ctx,  JitOptRef sym);
-extern JitOptRef _Py_uop_sym_new_slots_object(JitOptContext *ctx, unsigned int type_version);
-extern JitOptRef _Py_uop_sym_slots_getattr(JitOptContext *ctx, JitOptRef ref, uint16_t slot_index);
-extern void _Py_uop_sym_slots_setattr(JitOptContext *ctx, JitOptRef ref, uint16_t slot_index, JitOptRef value);
+extern JitOptRef _Py_uop_sym_new_descr_object(JitOptContext *ctx, unsigned int type_version);
+extern JitOptRef _Py_uop_sym_get_attr(JitOptContext *ctx, JitOptRef ref, uint16_t slot_index);
+extern JitOptRef _Py_uop_sym_set_attr(JitOptContext *ctx, JitOptRef ref, uint16_t slot_index, JitOptRef value);
 extern JitOptRef _Py_uop_sym_new_predicate(JitOptContext *ctx, JitOptRef lhs_ref, JitOptRef rhs_ref, JitOptPredicateKind kind);
 extern void _Py_uop_sym_apply_predicate_narrowing(JitOptContext *ctx, JitOptRef sym, bool branch_is_true);
 

Include/internal/pycore_optimizer_types.h

@@ -16,9 +16,9 @@ extern "C" {
 
 #define TY_ARENA_SIZE (UOP_MAX_TRACE_LENGTH * 5)
 
-// Maximum slots per object tracked symbolically
-#define MAX_SYMBOLIC_SLOTS_SIZE 16
-#define SLOTS_ARENA_SIZE (MAX_SYMBOLIC_SLOTS_SIZE * 100)
+// Maximum descriptor mappings per object tracked symbolically
+#define MAX_SYMBOLIC_DESCR_SIZE 16
+#define DESCR_ARENA_SIZE (MAX_SYMBOLIC_DESCR_SIZE * 100)
 
 // Need extras for root frame and for overflow frame (see TRACE_STACK_PUSH())
 #define MAX_ABSTRACT_FRAME_DEPTH (16)
@@ -45,7 +45,7 @@ typedef enum _JitSymType {
     JIT_SYM_TRUTHINESS_TAG = 9,
     JIT_SYM_COMPACT_INT = 10,
     JIT_SYM_PREDICATE_TAG = 11,
-    JIT_SYM_SLOTS_TAG = 12,
+    JIT_SYM_DESCR_TAG = 12,
 } JitSymType;
 
 typedef struct _jit_opt_known_class {
@@ -99,13 +99,13 @@ typedef struct {
     uint16_t symbol;
 } JitOptDescrMapping;
 
-typedef struct _jit_opt_slots {
+typedef struct _jit_opt_descr {
     uint8_t tag;
-    uint8_t num_slots;
+    uint8_t num_descrs;
     uint16_t last_modified_index;  // Index in out_buffer when this object was last modified
     uint32_t type_version;
-    JitOptDescrMapping *slots;
-} JitOptSlotsObject;
+    JitOptDescrMapping *descrs;
+} JitOptDescrObject;
 
 typedef union _jit_opt_symbol {
     uint8_t tag;
@@ -115,7 +115,7 @@ typedef union _jit_opt_symbol {
     JitOptTuple tuple;
     JitOptTruthiness truthiness;
     JitOptCompactInt compact;
-    JitOptSlotsObject slots;
+    JitOptDescrObject descr;
     JitOptPredicate predicate;
 } JitOptSymbol;
 
@@ -145,11 +145,11 @@ typedef struct ty_arena {
     JitOptSymbol arena[TY_ARENA_SIZE];
 } ty_arena;
 
-typedef struct slots_arena {
-    int slots_curr_number;
-    int slots_max_number;
-    JitOptDescrMapping arena[SLOTS_ARENA_SIZE];
-} slots_arena;
+typedef struct descr_arena {
+    int descr_curr_number;
+    int descr_max_number;
+    JitOptDescrMapping arena[DESCR_ARENA_SIZE];
+} descr_arena;
 
 #ifdef __cplusplus
 }