use _LOAD_COMMON_CONSTANT and update tests

Author: Sacul0457

Lib/test/test_capi/test_opt.py

@@ -5710,7 +5710,6 @@ class A:
         res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
         self.assertEqual(res, TIER2_THRESHOLD)
         uops = get_opnames(ex)
-
         self.assertIn("_MATCH_CLASS", uops)
         self.assertEqual(count_ops(ex, "_POP_TOP_NOP"), 4)
 
@@ -5728,9 +5727,8 @@ def testfunc(n):
         res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
         self.assertEqual(res, TIER2_THRESHOLD)
         uops = get_opnames(ex)
-
-        self.assertIn("_MATCH_MAPPING", uops)
-        self.assertNotIn("_GUARD_BIT_IS_SET_POP", uops)
+        self.assertNotIn("_MATCH_MAPPING", uops)
+        self.assertIn("_LOAD_COMMON_CONSTANT", uops)
 
     def test_match_sequence(self):
         def testfunc(n):
@@ -5745,9 +5743,8 @@ def testfunc(n):
         res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
         self.assertEqual(res, TIER2_THRESHOLD)
         uops = get_opnames(ex)
-
-        self.assertIn("_MATCH_SEQUENCE", uops)
-        self.assertNotIn("_GUARD_BIT_IS_SET_POP", uops)
+        self.assertNotIn("_MATCH_SEQUENCE", uops)
+        self.assertIn("_LOAD_COMMON_CONSTANT", uops)
 
     def test_dict_update(self):
         def testfunc(n):

Python/optimizer_bytecodes.c

@@ -2599,7 +2599,7 @@ dummy_func(void) {
         PyTypeObject *type = sym_get_type(subject);
         if (type != NULL) {
             int match = type->tp_flags & Py_TPFLAGS_MAPPING;
-            REPLACE_OP(this_instr, _LOAD_COMMON_CONST, match? CONSTANT_TRUE : CONSTANT_FALSE, 0);
+            REPLACE_OP(this_instr, _LOAD_COMMON_CONSTANT, match? CONSTANT_TRUE : CONSTANT_FALSE, 0);
         }
         else {
             res = sym_new_type(ctx, &PyBool_Type);
@@ -2610,7 +2610,7 @@ dummy_func(void) {
         PyTypeObject *type = sym_get_type(subject);
         if (type != NULL) {
             int match = type->tp_flags & Py_TPFLAGS_SEQUENCE;
-            REPLACE_OP(this_instr, _LOAD_COMMON_CONST, match? CONSTANT_TRUE : CONSTANT_FALSE, 0);
+            REPLACE_OP(this_instr, _LOAD_COMMON_CONSTANT, match? CONSTANT_TRUE : CONSTANT_FALSE, 0);
         }
         else {
             res = sym_new_type(ctx, &PyBool_Type);