set IS_NULL as a flag

python · Fidget-Spinner · Feb 13, 2024 · Feb 6, 2024 · Feb 6, 2024 · Feb 6, 2024
commit 40a19f7305b3c0f026123290ae16ea94b35911ad
@@ -63,7 +63,8 @@
 // Flags for below.
 #define KNOWN_TYPE 1 << 0  // Just to differentiate NULL in typ
 #define TRUE_CONST 1 << 1
-#define NOT_NULL 1 << 2
+#define IS_NULL    1 << 2
+#define NOT_NULL   1 << 3
 
 typedef struct {
     int flags;
@@ -255,6 +256,12 @@ sym_set_flag(_Py_UOpsSymType *sym, int flag)
     sym->flags |= flag;
 }
 
+static inline void
+sym_clear_flag(_Py_UOpsSymType *sym, int flag)
+{
+    sym->flags &= (~flag);
+}
+
 static inline bool
 sym_has_flag(_Py_UOpsSymType *sym, int flag)
 {
@@ -269,6 +276,13 @@ sym_set_type(_Py_UOpsSymType *sym, PyTypeObject *tp)
     sym_set_flag(sym, KNOWN_TYPE);
 }
 
+static inline void
+sym_set_null(_Py_UOpsSymType *sym)
+{
+    sym_set_flag(sym, IS_NULL);
+    sym_clear_flag(sym, NOT_NULL);
+}
+
 
 static inline _Py_UOpsSymType*
 sym_new_unknown(_Py_UOpsAbstractInterpContext *ctx)
@@ -326,7 +340,7 @@ sym_new_null(_Py_UOpsAbstractInterpContext *ctx)
     if (null_sym == NULL) {
         return NULL;
     }
-    sym_set_type(null_sym, NULL);
+    sym_set_null(null_sym);
     ctx->frequent_syms.push_nulL_sym = null_sym;
     return null_sym;
 }

diff --git a/Python/tier2_redundancy_eliminator_bytecodes.c b/Python/tier2_redundancy_eliminator_bytecodes.c
@@ -32,7 +32,7 @@ dummy_func(void) {
     op(_LOAD_FAST_CHECK, (-- value)) {
         value = GETLOCAL(oparg);
         // We guarantee this will error - just bail and don't optimize it.
-        if (sym_matches_type(value, NULL)) {
+        if (sym_has_flag(value, IS_NULL)) {
             goto out_of_space;
         }
     }
@@ -179,7 +179,7 @@ dummy_func(void) {
     }
 
     op(_CHECK_CALL_BOUND_METHOD_EXACT_ARGS, (callable, null, unused[oparg] -- callable, null, unused[oparg])) {
-        sym_set_type(null, NULL);
+        sym_set_null(null);
         sym_set_type(callable, &PyMethod_Type);
     }
 

diff --git a/Python/tier2_redundancy_eliminator_cases.c.h b/Python/tier2_redundancy_eliminator_cases.c.h
@@ -17,7 +17,7 @@
             _Py_UOpsSymType *value;
             value = GETLOCAL(oparg);
             // We guarantee this will error - just bail and don't optimize it.
-            if (sym_matches_type(value, NULL)) {
+            if (sym_has_flag(value, IS_NULL)) {
                 goto out_of_space;
             }
             stack_pointer[0] = value;
@@ -1243,7 +1243,7 @@
             _Py_UOpsSymType *callable;
             null = stack_pointer[-1 - oparg];
             callable = stack_pointer[-2 - oparg];
-            sym_set_type(null, NULL);
+            sym_set_null(null);
             sym_set_type(callable, &PyMethod_Type);
             break;
         }