import _specializations, _specialized_instructions directly from _opcode_metadata rather than via opcode

Author: iritkatriel

Lib/dis.py

@@ -15,10 +15,10 @@
     _nb_ops,
     _intrinsic_1_descs,
     _intrinsic_2_descs,
-    _specializations,
-    _specialized_instructions,
 )
 
+from _opcode_metadata import _specializations, _specialized_instructions
+
 __all__ = ["hasarg", "hasconst", "hasname", "hasjump", "hasjrel",
            "hasjabs", "hasfree", "haslocal", "hasexc", "hascompare",
            "stack_effect", "code_info", "dis", "disassemble", "distb",

Lib/opcode.py

@@ -7,11 +7,6 @@
 
 __all__ = ["cmp_op", "opname", "opmap", "HAVE_ARGUMENT", "EXTENDED_ARG"]
 
-import sys
-# The build uses older versions of Python which do not have _opcode_metadata
-if sys.version_info[:2] >= (3, 13):
-    from _opcode_metadata import _specializations, _specialized_instructions
-
 cmp_op = ('<', '<=', '==', '!=', '>', '>=')
 
 

Lib/test/test__opcode.py

@@ -2,6 +2,7 @@
 from test.support.import_helper import import_module
 import unittest
 import opcode
+import _opcode_metadata
 
 _opcode = import_module("_opcode")
 from _opcode import stack_effect
@@ -105,7 +106,7 @@ def test_specialization_stats(self):
         stat_names = ["success", "failure", "hit", "deferred", "miss", "deopt"]
         specialized_opcodes = [
             op.lower()
-            for op in opcode._specializations
+            for op in _opcode_metadata._specializations
             if opcode._inline_cache_entries[opcode.opmap[op]]
         ]
         self.assertIn('load_attr', specialized_opcodes)

Lib/test/test_dis.py

@@ -12,6 +12,7 @@
 from test.support.bytecode_helper import BytecodeTestCase
 
 import opcode
+import _opcode_metadata
 
 
 def get_tb():
@@ -1939,12 +1940,12 @@ def test_baseopname_and_baseopcode(self):
             self.assertEqual(code, baseopcode)
 
         # Specialized instructions
-        for name in opcode._specialized_instructions:
+        for name in _opcode_metadata._specialized_instructions:
             instruction = Instruction(opname=name, opcode=dis._all_opmap[name], arg=None, argval=None, argrepr='',
                                       offset=0, start_offset=0, starts_line=1, is_jump_target=False, positions=None)
             baseopname = instruction.baseopname
             baseopcode = instruction.baseopcode
-            self.assertIn(name, opcode._specializations[baseopname])
+            self.assertIn(name, _opcode_metadata._specializations[baseopname])
             self.assertEqual(opcode.opmap[baseopname], baseopcode)
 
     def test_jump_target(self):

Lib/test/test_embed.py

@@ -354,14 +354,14 @@ def test_specialized_static_code_gets_unspecialized_at_Py_FINALIZE(self):
         code = textwrap.dedent("""\
             import dis
             import importlib._bootstrap
-            import opcode
+            import _opcode_metadata
             import test.test_dis
 
             def is_specialized(f):
                 for instruction in dis.get_instructions(f, adaptive=True):
                     opname = instruction.opname
                     if (
-                        opname in opcode._specialized_instructions
+                        opname in _opcode_metadata._specialized_instructions
                         # Exclude superinstructions:
                         and "__" not in opname
                     ):