Address review

Author: sobolevn

Lib/test/test_capi/test_opt.py

@@ -1,5 +1,4 @@
 import contextlib
-import enum
 import itertools
 import sys
 import textwrap
@@ -3512,50 +3511,6 @@ def f(n):
         self.assertNotIn("_LOAD_ATTR_METHOD_NO_DICT", uops)
         self.assertIn("_LOAD_CONST_INLINE_BORROW", uops)
 
-    def test_load_attr_class_with_metaclass_check(self):
-        # LOAD_ATTR_CLASS_WITH_METACLASS_CHECK must check
-        # for `__class__` writes, see gh-149239
-        class ColorMeta(enum.EnumType):
-            pass
-
-        class Color(enum.IntEnum, metaclass=ColorMeta):
-            RED = 1
-
-        red = Color.RED
-
-        def f1(n):
-            for _ in range(n):
-                assert Color.RED == 1
-            return n
-
-        res, ex = self._run_with_optimizer(f1, TIER2_THRESHOLD)
-        self.assertIsNotNone(ex)
-        self.assertEqual(res, TIER2_THRESHOLD)
-        uops = get_opnames(ex)
-        self.assertIn("_CHECK_ATTR_CLASS", uops)
-        self.assertIn("_GUARD_TYPE_VERSION", uops)
-
-        # Reassign the `__class__` attr to deopt:
-        class Descriptor(enum.IntEnum):
-            RED = 1
-
-            def __get__(self, obj, owner):
-                return "descr"
-
-        red.__class__ = Descriptor
-
-        def f2(n):
-            for _ in range(n):
-                assert Color.RED == 'descr'
-            return n
-
-        res, ex = self._run_with_optimizer(f2, TIER2_THRESHOLD)
-        self.assertIsNotNone(ex)
-        self.assertEqual(res, TIER2_THRESHOLD)
-        uops = get_opnames(ex)
-        self.assertNotIn("_CHECK_ATTR_CLASS", uops)
-        self.assertNotIn("_GUARD_TYPE_VERSION", uops)
-
     def test_cached_load_special(self):
         class CM:
             def __enter__(self):

Lib/test/test_opcache.py

@@ -1,3 +1,4 @@
+import enum
 import copy
 import pickle
 import dis
@@ -2114,6 +2115,45 @@ def load_enum_member():
         self.assert_specialized(load_enum_member,
                                 "LOAD_ATTR_CLASS_WITH_METACLASS_CHECK")
 
+    @cpython_only
+    @requires_specialization
+    def test_load_attr_class_with_metaclass_check_149239(self):
+        # LOAD_ATTR_CLASS_WITH_METACLASS_CHECK must check
+        # for `__class__` writes, see gh-149239
+        class ColorMeta(enum.EnumType):
+            pass
+
+        class Color(enum.IntEnum, metaclass=ColorMeta):
+            RED = 1
+
+        red = Color.RED
+
+        def f1():
+            for _ in range(_testinternalcapi.SPECIALIZATION_THRESHOLD):
+                assert Color.RED == 1
+
+        f1()
+        self.assert_specialized(f1,
+                                "LOAD_ATTR_CLASS_WITH_METACLASS_CHECK")
+
+        # Reassign the `__class__` attr to deopt:
+        class Descriptor(enum.IntEnum):
+            RED = 1
+
+            def __get__(self, obj, owner):
+                return "descr"
+
+        red.__class__ = Descriptor
+
+        def f2():
+            for _ in range(_testinternalcapi.SPECIALIZATION_THRESHOLD):
+                assert Color.RED == 'descr'
+
+        f2()
+        self.assert_no_opcode(f2,
+                              "LOAD_ATTR_CLASS_WITH_METACLASS_CHECK")
+
+
 
 if __name__ == "__main__":
     unittest.main()