Remove sym_has_type

Author: tomasr8

Include/internal/pycore_optimizer.h

@@ -266,7 +266,6 @@ extern JitOptSymbol *_Py_uop_sym_new_type(
     JitOptContext *ctx, PyTypeObject *typ);
 extern JitOptSymbol *_Py_uop_sym_new_const(JitOptContext *ctx, PyObject *const_val);
 extern JitOptSymbol *_Py_uop_sym_new_null(JitOptContext *ctx);
-extern bool _Py_uop_sym_has_type(JitOptSymbol *sym);
 extern bool _Py_uop_sym_matches_type(JitOptSymbol *sym, PyTypeObject *typ);
 extern bool _Py_uop_sym_matches_type_version(JitOptSymbol *sym, unsigned int version);
 extern void _Py_uop_sym_set_null(JitOptContext *ctx, JitOptSymbol *sym);

Python/optimizer_analysis.c

@@ -324,7 +324,6 @@ remove_globals(_PyInterpreterFrame *frame, _PyUOpInstruction *buffer,
 #define sym_is_null _Py_uop_sym_is_null
 #define sym_new_const _Py_uop_sym_new_const
 #define sym_new_null _Py_uop_sym_new_null
-#define sym_has_type _Py_uop_sym_has_type
 #define sym_get_type _Py_uop_sym_get_type
 #define sym_matches_type _Py_uop_sym_matches_type
 #define sym_matches_type_version _Py_uop_sym_matches_type_version

Python/optimizer_bytecodes.c

@@ -21,7 +21,6 @@ typedef struct _Py_UOpsAbstractFrame _Py_UOpsAbstractFrame;
 #define sym_matches_type _Py_uop_sym_matches_type
 #define sym_matches_type_version _Py_uop_sym_matches_type_version
 #define sym_get_type _Py_uop_sym_get_type
-#define sym_has_type _Py_uop_sym_has_type
 #define sym_set_null(SYM) _Py_uop_sym_set_null(ctx, SYM)
 #define sym_set_non_null(SYM) _Py_uop_sym_set_non_null(ctx, SYM)
 #define sym_set_type(SYM, TYPE) _Py_uop_sym_set_type(ctx, SYM, TYPE)
@@ -872,8 +871,9 @@ dummy_func(void) {
     }
 
     op(_CALL_TYPE_1, (unused, unused, arg -- res)) {
-        if (sym_has_type(arg)) {
-            res = sym_new_const(ctx, (PyObject *)sym_get_type(arg));
+        PyObject *type = (PyObject *)sym_get_type(arg);
+        if (type) {
+            res = sym_new_const(ctx, type);
         }
         else {
             res = sym_new_not_null(ctx);
@@ -914,7 +914,7 @@ dummy_func(void) {
             assert(value != NULL);
             eliminate_pop_guard(this_instr, !Py_IsNone(value));
         }
-        else if (sym_has_type(val)) {
+        else if (sym_get_type(val)) {
             assert(!sym_matches_type(val, &_PyNone_Type));
             eliminate_pop_guard(this_instr, true);
         }
@@ -927,7 +927,7 @@ dummy_func(void) {
             assert(value != NULL);
             eliminate_pop_guard(this_instr, Py_IsNone(value));
         }
-        else if (sym_has_type(val)) {
+        else if (sym_get_type(val)) {
             assert(!sym_matches_type(val, &_PyNone_Type));
             eliminate_pop_guard(this_instr, false);
         }

Python/optimizer_cases.c.h

@@ -439,26 +439,6 @@ _Py_uop_sym_get_type_version(JitOptSymbol *sym)
     Py_UNREACHABLE();
 }
 
-bool
-_Py_uop_sym_has_type(JitOptSymbol *sym)
-{
-    JitSymType tag = sym->tag;
-    switch(tag) {
-        case JIT_SYM_NULL_TAG:
-        case JIT_SYM_TYPE_VERSION_TAG:
-        case JIT_SYM_BOTTOM_TAG:
-        case JIT_SYM_NON_NULL_TAG:
-        case JIT_SYM_UNKNOWN_TAG:
-            return false;
-        case JIT_SYM_KNOWN_CLASS_TAG:
-        case JIT_SYM_KNOWN_VALUE_TAG:
-        case JIT_SYM_TUPLE_TAG:
-        case JIT_SYM_TRUTHINESS_TAG:
-            return true;
-    }
-    Py_UNREACHABLE();
-}
-
 bool
 _Py_uop_sym_matches_type(JitOptSymbol *sym, PyTypeObject *typ)
 {