Address review

Author: Fidget-Spinner

Lib/test/test_capi/test_opt.py

@@ -2408,6 +2408,19 @@ def testfunc(n):
 
         self.assertIn("_POP_TOP_UNICODE", uops)
 
+    def test_store_pop_top_specialize_none(self):
+        def testfunc(n):
+            for _ in range(n):
+                global_identity(None)
+
+        testfunc(TIER2_THRESHOLD)
+
+        ex = get_first_executor(testfunc)
+        self.assertIsNotNone(ex)
+        uops = get_opnames(ex)
+
+        self.assertIn("_POP_TOP_NOP", uops)
+
 
 
 def global_identity(x):

Python/bytecodes.c

@@ -346,26 +346,22 @@ dummy_func(
         }
 
         op(_POP_TOP_NOP, (value --)) {
-            // TODO (gh-134584): Consider moving this to a function pointer table and replicate.
             assert(!PyStackRef_RefcountOnObject(value) ||
                 _Py_IsImmortal((PyStackRef_AsPyObjectBorrow(value))));
             DEAD(value);
         }
 
         op(_POP_TOP_INT, (value --)) {
-            // TODO (gh-134584): Consider moving this to a function pointer table and replicate.
             assert(PyLong_CheckExact(PyStackRef_AsPyObjectBorrow(value)));
             PyStackRef_CLOSE_SPECIALIZED(value, _PyLong_ExactDealloc);
         }
 
         op(_POP_TOP_FLOAT, (value --)) {
-            // TODO (gh-134584): Consider moving this to a function pointer table and replicate.
             assert(PyFloat_CheckExact(PyStackRef_AsPyObjectBorrow(value)));
             PyStackRef_CLOSE_SPECIALIZED(value, _PyFloat_ExactDealloc);
         }
 
         op(_POP_TOP_UNICODE, (value --)) {
-            // TODO (gh-134584): Consider moving this to a function pointer table and replicate.
             assert(PyUnicode_CheckExact(PyStackRef_AsPyObjectBorrow(value)));
             PyStackRef_CLOSE_SPECIALIZED(value, _PyUnicode_ExactDealloc);
         }

Python/optimizer_bytecodes.c

@@ -566,7 +566,8 @@ dummy_func(void) {
         PyTypeObject *typ = sym_get_type(value);
         PyObject *const_val = sym_get_const(ctx, value);
         if (PyJitRef_IsBorrowed(value) ||
-            (const_val != NULL && _Py_IsImmortal(const_val))) {
+            sym_is_immortal(value) ||
+            sym_is_null(value)) {
             REPLACE_OP(this_instr, _POP_TOP_NOP, 0, 0);
         }
         else if (typ == &PyLong_Type) {
@@ -578,9 +579,6 @@ dummy_func(void) {
         else if (typ == &PyUnicode_Type) {
             REPLACE_OP(this_instr, _POP_TOP_UNICODE, 0, 0);
         }
-        else if (typ == &PyBool_Type) {
-            REPLACE_OP(this_instr, _POP_TOP_NOP, 0, 0);
-        }
     }
 
     op(_COPY, (bottom, unused[oparg-1] -- bottom, unused[oparg-1], top)) {