@@ -56,14 +56,36 @@ typedef struct {
     PyObject *_co_freevars;
 } _PyCoCached;
 
+// TYPENODE is a tagged pointer that uses the last 2 LSB as the tag
+#define _Py_TYPENODE_t uintptr_t
+
+// TYPENODE Tags
+typedef enum _Py_TypeNodeTags {
+    // Node is unused
+    TYPE_NULL = 0,
+    // TYPE_ROOT can point to a PyTypeObject or be a NULL
+    TYPE_ROOT = 1,
+    // TYPE_REF points to a TYPE_ROOT or a TYPE_REF
+    TYPE_REF  = 2
+} _Py_TypeNodeTags;
+
+#define _Py_TYPENODE_GET_TAG(typenode) ((typenode) & (0b11))
+#define _Py_TYPENODE_CLEAR_TAG(typenode) ((typenode) & (~(uintptr_t)(0b11)))
+
+#define _Py_TYPENODE_MAKE_ROOT(ptr) (_Py_TYPENODE_CLEAR_TAG(ptr) | TYPE_ROOT)
+#define _Py_TYPENODE_MAKE_REF(ptr) (_Py_TYPENODE_CLEAR_TAG(ptr) | TYPE_REF)
+
+#define _Py_TYPENODE_NULL 0
+#define _Py_TYPENODE_NULLROOT _Py_TYPENODE_MAKE_ROOT(_Py_TYPENODE_NULL)
+
 // Tier 2 types meta interpreter
 typedef struct _PyTier2TypeContext {
     // points into type_stack, points to one element after the stack
-    PyTypeObject** type_stack_ptr;
+    _Py_TYPENODE_t *type_stack_ptr;
     int type_locals_len;
     int type_stack_len;
-    PyTypeObject** type_stack;
-    PyTypeObject** type_locals;
+    _Py_TYPENODE_t *type_stack;
+    _Py_TYPENODE_t *type_locals;
 } _PyTier2TypeContext;
 
 // Tier 2 interpreter information
 
@@ -300,7 +300,11 @@ dummy_func(
             DECREF_INPUTS_AND_REUSE_FLOAT(left, right, dsum, sum);
         }
 
-        inst(BINARY_CHECK_FLOAT, (left, right -- left_unboxed : PyRawFloat_Type, right_unboxed : PyRawFloat_Type)) {
+        inst(BINARY_CHECK_FLOAT, (
+                left, right 
+                -- left_unboxed : {<<= PyFloat_Type, PyRawFloat_Type}, 
+                   right_unboxed: {<<= PyFloat_Type, PyRawFloat_Type})
+            ) {
             assert(cframe.use_tracing == 0);
             bb_test = PyFloat_CheckExact(left) && (Py_TYPE(left) == Py_TYPE(right));
             left_unboxed = (bb_test
@@ -338,7 +342,7 @@ dummy_func(
             U_INST(BINARY_OP_ADD_INT_REST);
         }
 
-        inst(BINARY_CHECK_INT, (left, right -- left : PyLong_Type, right : PyLong_Type)) {
+        inst(BINARY_CHECK_INT, (left, right -- left : <<= PyLong_Type, right : <<= PyLong_Type)) {
             assert(cframe.use_tracing == 0);
             bb_test = PyLong_CheckExact(left) && (Py_TYPE(left) == Py_TYPE(right));
         }
Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,11 @@ dummy_func(`
`300`	`300`	`DECREF_INPUTS_AND_REUSE_FLOAT(left, right, dsum, sum);`
`301`	`301`	`}`
`302`	`302`
`303`		`- inst(BINARY_CHECK_FLOAT, (left, right -- left_unboxed : PyRawFloat_Type, right_unboxed : PyRawFloat_Type)) {`
	`303`	`+ inst(BINARY_CHECK_FLOAT, (`
	`304`	`+ left, right`
	`305`	`+ -- left_unboxed : {<<= PyFloat_Type, PyRawFloat_Type},`
	`306`	`+ right_unboxed: {<<= PyFloat_Type, PyRawFloat_Type})`
	`307`	`+ ) {`
`304`	`308`	`assert(cframe.use_tracing == 0);`
`305`	`309`	`bb_test = PyFloat_CheckExact(left) && (Py_TYPE(left) == Py_TYPE(right));`
`306`	`310`	`left_unboxed = (bb_test`
`@@ -338,7 +342,7 @@ dummy_func(`
`338`	`342`	`U_INST(BINARY_OP_ADD_INT_REST);`
`339`	`343`	`}`
`340`	`344`
`341`		`- inst(BINARY_CHECK_INT, (left, right -- left : PyLong_Type, right : PyLong_Type)) {`
	`345`	`+ inst(BINARY_CHECK_INT, (left, right -- left : <<= PyLong_Type, right : <<= PyLong_Type)) {`
`342`	`346`	`assert(cframe.use_tracing == 0);`
`343`	`347`	`bb_test = PyLong_CheckExact(left) && (Py_TYPE(left) == Py_TYPE(right));`
`344`	`348`	`}`