Sep 23, 2025 · Sep 23, 2025 · Sep 23, 2025 · Sep 23, 2025 · Sep 25, 2025 · Sep 25, 2025
diff --git a/.cspell.dict/cpython.txt b/.cspell.dict/cpython.txt
 cellvars
 cmpop
 denom
 deopt
 dictoffset
 elts
 excepthandler
diff --git a/.gitattributes b/.gitattributes
 Cargo.lock  linguist-generated
 *.snap      linguist-generated -merge
 vm/src/stdlib/ast/gen.rs    linguist-generated -merge
 compiler/core/src/opcodes.rs linguist-generated=true
 Lib/*.py    text working-tree-encoding=UTF-8 eol=LF
 **/*.rs     text working-tree-encoding=UTF-8 eol=LF
 *.pck       binary
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Lib/dis.py b/Lib/dis.py
 import types # XXX: From CPython 3.13.7
 from _dis import *

 # XXX: From CPython 3.13.7
 from opcode import *
 # XXX: From CPython 3.13.7
 from opcode import (
    __all__ as _opcodes_all,
    _cache_format,
    _inline_cache_entries,
    _nb_ops,
    _intrinsic_1_descs,
    _intrinsic_2_descs,
    _specializations,
    _specialized_opmap,
 )

 # XXX: From CPython 3.13.7
 from _opcode import get_executor

 # XXX: From CPython 3.13.7
 __all__ = ["code_info", "dis", "disassemble", "distb", "disco",
           "findlinestarts", "findlabels", "show_code",
           "get_instructions", "Instruction", "Bytecode"] + _opcodes_all
 del _opcodes_all

 # XXX: From CPython 3.13.7
 _have_code = (types.MethodType, types.FunctionType, types.CodeType,
              classmethod, staticmethod, type)

 # XXX: From CPython 3.13.7
 CONVERT_VALUE = opmap['CONVERT_VALUE']

 # XXX: From CPython 3.13.7
 SET_FUNCTION_ATTRIBUTE = opmap['SET_FUNCTION_ATTRIBUTE']
 FUNCTION_ATTR_FLAGS = ('defaults', 'kwdefaults', 'annotations', 'closure')

 # XXX: From CPython 3.13.7
 ENTER_EXECUTOR = opmap['ENTER_EXECUTOR']
 LOAD_CONST = opmap['LOAD_CONST']
 RETURN_CONST = opmap['RETURN_CONST']
 LOAD_GLOBAL = opmap['LOAD_GLOBAL']
 BINARY_OP = opmap['BINARY_OP']
 JUMP_BACKWARD = opmap['JUMP_BACKWARD']
 FOR_ITER = opmap['FOR_ITER']
 SEND = opmap['SEND']
 LOAD_ATTR = opmap['LOAD_ATTR']
 LOAD_SUPER_ATTR = opmap['LOAD_SUPER_ATTR']
 CALL_INTRINSIC_1 = opmap['CALL_INTRINSIC_1']
 CALL_INTRINSIC_2 = opmap['CALL_INTRINSIC_2']
 LOAD_FAST_LOAD_FAST = opmap['LOAD_FAST_LOAD_FAST']
 STORE_FAST_LOAD_FAST = opmap['STORE_FAST_LOAD_FAST']
 STORE_FAST_STORE_FAST = opmap['STORE_FAST_STORE_FAST']

 # XXX: From CPython 3.13.7
 CACHE = opmap["CACHE"]

 # XXX: From CPython 3.13.7
 _all_opname = list(opname)
 _all_opmap = dict(opmap)
 for name, op in _specialized_opmap.items():
    # fill opname and opmap
    assert op < len(_all_opname)
    _all_opname[op] = name
    _all_opmap[name] = op

 # XXX: From CPython 3.13.7
 deoptmap = {
    specialized: base for base, family in _specializations.items() for specialized in family
 }

 # Disassembling a file by following cpython Lib/dis.py
 def _test():
diff --git a/Lib/test/test__opcode.py b/Lib/test/test__opcode.py
        self.check_bool_function_result(_opcode.has_local, invalid, False)
        self.check_bool_function_result(_opcode.has_exc, invalid, False)

    @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: module 'dis' has no attribute 'opmap'
    def test_is_valid(self):
        names = [
            'CACHE',
        opcodes = [dis.opmap[opname] for opname in names]
        self.check_bool_function_result(_opcode.is_valid, opcodes, True)

    @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: module 'dis' has no attribute 'hasarg'
    def test_oplists(self):
        def check_function(self, func, expected):
            for op in [-10, 520]:


 class StackEffectTests(unittest.TestCase):
    @unittest.expectedFailure # TODO: RUSTPYTHON
    def test_stack_effect(self):
        self.assertEqual(stack_effect(dis.opmap['POP_TOP']), -1)
        self.assertEqual(stack_effect(dis.opmap['BUILD_SLICE'], 0), -1)
                self.assertRaises(ValueError, stack_effect, code)
                self.assertRaises(ValueError, stack_effect, code, 0)

    @unittest.expectedFailure # TODO: RUSTPYTHON
    def test_stack_effect_jump(self):
        FOR_ITER = dis.opmap['FOR_ITER']
        self.assertEqual(stack_effect(FOR_ITER, 0), 1)
diff --git a/compiler/core/Cargo.toml b/compiler/core/Cargo.toml
 itertools = { workspace = true }
 malachite-bigint = { workspace = true }
 num-complex = { workspace = true }
 num_enum = { workspace = true }
 num-traits = { workspace = true }

 lz4_flex = "0.11"

diff --git a/compiler/core/src/lib.rs b/compiler/core/src/lib.rs
 pub mod frozen;
 pub mod marshal;
 mod mode;
 pub mod opcode;
 mod opcodes;

 pub use mode::Mode;
 pub use opcode::{Opcode, PseudoOpcode, RealOpcode};

 pub use ruff_source_file::{LineIndex, OneIndexed, SourceFile, SourceFileBuilder, SourceLocation};
diff --git a/compiler/core/src/opcode.rs b/compiler/core/src/opcode.rs
 use crate::marshal::MarshalError;
 pub use crate::opcodes::{PseudoOpcode, RealOpcode};

 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
 pub enum Opcode {
    Real(RealOpcode),
    Pseudo(PseudoOpcode),
 }

 impl TryFrom<u16> for Opcode {
    type Error = MarshalError;

    fn try_from(raw: u16) -> Result<Self, Self::Error> {
        // Try first pseudo opcode. If not, fallback to real opcode.
        PseudoOpcode::try_from(raw)
            .map(Opcode::Pseudo)
            .or_else(|_| {
                Self::try_from(u8::try_from(raw).map_err(|_| Self::Error::InvalidBytecode)?)
            })
    }
 }

 impl TryFrom<u8> for Opcode {
    type Error = MarshalError;

    fn try_from(raw: u8) -> Result<Self, Self::Error> {
        // u8 can never be a pseduo.
        RealOpcode::try_from(raw).map(Opcode::Real)
    }
 }

 macro_rules! impl_try_from {
    ($struct_name:ident, $($t:ty),+ $(,)?) => {
        $(
            impl TryFrom<$t> for $struct_name {
                type Error = MarshalError;

                fn try_from(raw: $t) -> Result<Self, Self::Error> {
                    Self::try_from(u16::try_from(raw).map_err(|_| Self::Error::InvalidBytecode)?)
                }
            }
        )+
    };
 }

 impl_try_from!(
    Opcode, i8, i16, i32, i64, i128, isize, u32, u64, u128, usize
 );
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,6 +12,7 @@ cellvar
		cellvars
		cmpop
		denom
		deopt
		dictoffset
		elts
		excepthandler
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,6 +2,7 @@ Lib/** linguist-vendored
		Cargo.lock linguist-generated
		*.snap linguist-generated -merge
		vm/src/stdlib/ast/gen.rs linguist-generated -merge
		compiler/core/src/opcodes.rs linguist-generated=true
		Lib/*.py text working-tree-encoding=UTF-8 eol=LF
		*/.rs text working-tree-encoding=UTF-8 eol=LF
		*.pck binary
Original file line number	Diff line number	Diff line change
		@@ -1,5 +1,73 @@
		import types # XXX: From CPython 3.13.7
		from _dis import *

		# XXX: From CPython 3.13.7
		from opcode import *
		# XXX: From CPython 3.13.7
		from opcode import (
		__all__ as _opcodes_all,
		_cache_format,
		_inline_cache_entries,
		_nb_ops,
		_intrinsic_1_descs,
		_intrinsic_2_descs,
		_specializations,
		_specialized_opmap,
		)

		# XXX: From CPython 3.13.7
		from _opcode import get_executor

		# XXX: From CPython 3.13.7
		__all__ = ["code_info", "dis", "disassemble", "distb", "disco",
		"findlinestarts", "findlabels", "show_code",
		"get_instructions", "Instruction", "Bytecode"] + _opcodes_all
		del _opcodes_all

		# XXX: From CPython 3.13.7
		_have_code = (types.MethodType, types.FunctionType, types.CodeType,
		classmethod, staticmethod, type)

		# XXX: From CPython 3.13.7
		CONVERT_VALUE = opmap['CONVERT_VALUE']

		# XXX: From CPython 3.13.7
		SET_FUNCTION_ATTRIBUTE = opmap['SET_FUNCTION_ATTRIBUTE']
		FUNCTION_ATTR_FLAGS = ('defaults', 'kwdefaults', 'annotations', 'closure')

		# XXX: From CPython 3.13.7
		ENTER_EXECUTOR = opmap['ENTER_EXECUTOR']
		LOAD_CONST = opmap['LOAD_CONST']
		RETURN_CONST = opmap['RETURN_CONST']
		LOAD_GLOBAL = opmap['LOAD_GLOBAL']
		BINARY_OP = opmap['BINARY_OP']
		JUMP_BACKWARD = opmap['JUMP_BACKWARD']
		FOR_ITER = opmap['FOR_ITER']
		SEND = opmap['SEND']
		LOAD_ATTR = opmap['LOAD_ATTR']
		LOAD_SUPER_ATTR = opmap['LOAD_SUPER_ATTR']
		CALL_INTRINSIC_1 = opmap['CALL_INTRINSIC_1']
		CALL_INTRINSIC_2 = opmap['CALL_INTRINSIC_2']
		LOAD_FAST_LOAD_FAST = opmap['LOAD_FAST_LOAD_FAST']
		STORE_FAST_LOAD_FAST = opmap['STORE_FAST_LOAD_FAST']
		STORE_FAST_STORE_FAST = opmap['STORE_FAST_STORE_FAST']

		# XXX: From CPython 3.13.7
		CACHE = opmap["CACHE"]

		# XXX: From CPython 3.13.7
		_all_opname = list(opname)
		_all_opmap = dict(opmap)
		for name, op in _specialized_opmap.items():
		# fill opname and opmap
		assert op < len(_all_opname)
		_all_opname[op] = name
		_all_opmap[name] = op

		# XXX: From CPython 3.13.7
		deoptmap = {
		specialized: base for base, family in _specializations.items() for specialized in family
		}

		# Disassembling a file by following cpython Lib/dis.py
		def _test():
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,7 +27,6 @@ def test_invalid_opcodes(self):
		self.check_bool_function_result(_opcode.has_local, invalid, False)
		self.check_bool_function_result(_opcode.has_exc, invalid, False)

		@unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: module 'dis' has no attribute 'opmap'
		def test_is_valid(self):
		names = [
		'CACHE',
Expand All		@@ -39,7 +38,6 @@ def test_is_valid(self):
		opcodes = [dis.opmap[opname] for opname in names]
		self.check_bool_function_result(_opcode.is_valid, opcodes, True)

		@unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: module 'dis' has no attribute 'hasarg'
		def test_oplists(self):
		def check_function(self, func, expected):
		for op in [-10, 520]:
Expand All		@@ -58,7 +56,6 @@ def check_function(self, func, expected):


		class StackEffectTests(unittest.TestCase):
		@unittest.expectedFailure # TODO: RUSTPYTHON
		def test_stack_effect(self):
		self.assertEqual(stack_effect(dis.opmap['POP_TOP']), -1)
		self.assertEqual(stack_effect(dis.opmap['BUILD_SLICE'], 0), -1)
Expand All		@@ -79,7 +76,6 @@ def test_stack_effect(self):
		self.assertRaises(ValueError, stack_effect, code)
		self.assertRaises(ValueError, stack_effect, code, 0)

		@unittest.expectedFailure # TODO: RUSTPYTHON
		def test_stack_effect_jump(self):
		FOR_ITER = dis.opmap['FOR_ITER']
		self.assertEqual(stack_effect(FOR_ITER, 0), 1)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,6 +17,8 @@ bitflags = { workspace = true }
		itertools = { workspace = true }
		malachite-bigint = { workspace = true }
		num-complex = { workspace = true }
		num_enum = { workspace = true }
		num-traits = { workspace = true }

		lz4_flex = "0.11"

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,7 +5,10 @@ pub mod bytecode;
		pub mod frozen;
		pub mod marshal;
		mod mode;
		pub mod opcode;
		mod opcodes;

		pub use mode::Mode;
		pub use opcode::{Opcode, PseudoOpcode, RealOpcode};

		pub use ruff_source_file::{LineIndex, OneIndexed, SourceFile, SourceFileBuilder, SourceLocation};
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,48 @@
		use crate::marshal::MarshalError;
		pub use crate::opcodes::{PseudoOpcode, RealOpcode};

		#[derive(Copy, Clone, Debug, Eq, PartialEq)]
		pub enum Opcode {
		Real(RealOpcode),
		Pseudo(PseudoOpcode),
		}

		impl TryFrom<u16> for Opcode {
		type Error = MarshalError;

		fn try_from(raw: u16) -> Result<Self, Self::Error> {
		// Try first pseudo opcode. If not, fallback to real opcode.
		PseudoOpcode::try_from(raw)
		.map(Opcode::Pseudo)
		.or_else(\|_\| {
		Self::try_from(u8::try_from(raw).map_err(\|_\| Self::Error::InvalidBytecode)?)
		})
		}
		}

		impl TryFrom<u8> for Opcode {
		type Error = MarshalError;

		fn try_from(raw: u8) -> Result<Self, Self::Error> {
		// u8 can never be a pseduo.
Check warning on line 27 in compiler/core/src/opcode.rs View workflow job for this annotation GitHub Actions/ Check Rust code with rustfmt and clippy `Misspelled word (pseduo) Suggestions: (pseudo*)`
		RealOpcode::try_from(raw).map(Opcode::Real)
		}
		}
coderabbitai[bot] marked this conversation as resolved. Show resolvedHide resolved

		macro_rules! impl_try_from {
		($struct_name:ident, $($t:ty),+ $(,)?) => {
		$(
		impl TryFrom<$t> for $struct_name {
		type Error = MarshalError;

		fn try_from(raw: $t) -> Result<Self, Self::Error> {
		Self::try_from(u16::try_from(raw).map_err(\|_\| Self::Error::InvalidBytecode)?)
		}
		}
		)+
		};
		}

		impl_try_from!(
		Opcode, i8, i16, i32, i64, i128, isize, u32, u64, u128, usize
		);