Jul 18, 2023 · Jul 14, 2023 · Jul 14, 2023 · Jul 15, 2023 · Jul 15, 2023 · Jul 15, 2023
diff --git a/Lib/dis.py b/Lib/dis.py
    _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",
diff --git a/Lib/opcode.py b/Lib/opcode.py

 __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 = ('<', '<=', '==', '!=', '>', '>=')


diff --git a/Lib/test/test__opcode.py b/Lib/test/test__opcode.py
 from test.support.import_helper import import_module
 import unittest
 import opcode
 import _opcode_metadata

 _opcode = import_module("_opcode")
 from _opcode import stack_effect
        stat_names = ["success", "failure", "hit", "deferred", "miss", "deopt"]
        specialized_opcodes = [
            op.lower()
            for op in_opcode_metadata._specializations
            for op inopcode._specializations
            if opcode._inline_cache_entries[opcode.opmap[op]]
        ]
        self.assertIn('load_attr', specialized_opcodes)
diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
 from test.support.bytecode_helper import BytecodeTestCase

 import opcode
 import _opcode_metadata


 def get_tb():
            self.assertEqual(code, baseopcode)

        # Specialized instructions
        for name in_opcode_metadata._specialized_instructions:
        for name inopcode._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_metadata._specializations[baseopname])
            self.assertIn(name,opcode._specializations[baseopname])
            self.assertEqual(opcode.opmap[baseopname], baseopcode)

    def test_jump_target(self):
diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
        code = textwrap.dedent("""\
            import dis
            import importlib._bootstrap
            import_opcode_metadata
            importopcode
            import test.test_dis

            def is_specialized(f):
                for instruction in dis.get_instructions(f, adaptive=True):
                    opname = instruction.opname
                    if (
                        opname in_opcode_metadata._specialized_instructions
                        opname inopcode._specialized_instructions
                        # Exclude superinstructions:
                        and "__" not in opname
                    ):
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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",
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,6 +7,11 @@

		__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 = ('<', '<=', '==', '!=', '>', '>=')


Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,7 +2,6 @@
		from test.support.import_helper import import_module
		import unittest
		import opcode
		import _opcode_metadata

		_opcode = import_module("_opcode")
		from _opcode import stack_effect
Expand DownExpand Up		@@ -106,7 +105,7 @@ def test_specialization_stats(self):
		stat_names = ["success", "failure", "hit", "deferred", "miss", "deopt"]
		specialized_opcodes = [
		op.lower()
		for op in_opcode_metadata._specializations
		for op inopcode._specializations
		if opcode._inline_cache_entries[opcode.opmap[op]]
		]
		self.assertIn('load_attr', specialized_opcodes)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,7 +12,6 @@
		from test.support.bytecode_helper import BytecodeTestCase

		import opcode
		import _opcode_metadata


		def get_tb():
Expand DownExpand Up		@@ -1940,12 +1939,12 @@ def test_baseopname_and_baseopcode(self):
		self.assertEqual(code, baseopcode)

		# Specialized instructions
		for name in_opcode_metadata._specialized_instructions:
		for name inopcode._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_metadata._specializations[baseopname])
		self.assertIn(name,opcode._specializations[baseopname])
		self.assertEqual(opcode.opmap[baseopname], baseopcode)

		def test_jump_target(self):
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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_metadata
		importopcode
		import test.test_dis

		def is_specialized(f):
		for instruction in dis.get_instructions(f, adaptive=True):
		opname = instruction.opname
		if (
		opname in_opcode_metadata._specialized_instructions
		opname inopcode._specialized_instructions
		# Exclude superinstructions:
		and "__" not in opname
		):
Expand Down