Skip to content

Replace CallMethod/LoadMethod opcodes with plain Call #6674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 4 commits into from
Jan 9, 2026
Merged

Replace CallMethod/LoadMethod opcodes with plain Call #6674

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
29d2d88
implementing call the correct way
youknowone Jan 8, 2026
8c097df
fix again
youknowone Jan 9, 2026
4140145
list custom instructions
youknowone Jan 9, 2026
6dbe436
Auto-format: cargo fmt --all
github-actions[bot] Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
list custom instructions
  • Loading branch information
@youknowone
youknowone committed Jan 9, 2026
commit 4140145847be3c992338f4cb6ce3e21d9cc7d77f
27 changes: 22 additions & 5 deletions crates/compiler-core/src/bytecode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,24 +963,41 @@ impl TryFrom<u8> for Instruction {

#[inline]
fn try_from(value: u8) -> Result<Self, MarshalError> {
// CPython-compatible opcodes (0-118)
let cpython_start = u8::from(Self::Cache);
let cpython_end = u8::from(Self::YieldValue { arg: Arg::marker() });

// Resume has a non-contiguous opcode (149)
let resume_id = u8::from(Self::Resume { arg: Arg::marker() });

let custom_start = u8::from(Self::Break {
target: Arg::marker(),
});
let custom_end = u8::from(Self::Subscript);
// RustPython-only opcodes (explicit list to avoid gaps like 125-127)
let custom_ops: &[u8] = &[
Copy link
Copy Markdown
Contributor

@ShaharNaveh ShaharNaveh Jan 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, I did exactly this on #6675 lol. I'll rebase after this gets merged

u8::from(Self::Break { target: Arg::marker() }),
u8::from(Self::BuildListFromTuples { size: Arg::marker() }),
u8::from(Self::BuildMapForCall { size: Arg::marker() }),
u8::from(Self::BuildSetFromTuples { size: Arg::marker() }),
u8::from(Self::BuildTupleFromIter),
u8::from(Self::BuildTupleFromTuples { size: Arg::marker() }),
// 125, 126, 127 are unused
u8::from(Self::Continue { target: Arg::marker() }),
u8::from(Self::JumpIfFalseOrPop { target: Arg::marker() }),
u8::from(Self::JumpIfTrueOrPop { target: Arg::marker() }),
u8::from(Self::JumpIfNotExcMatch(Arg::marker())),
u8::from(Self::LoadClassDeref(Arg::marker())),
u8::from(Self::Reverse { amount: Arg::marker() }),
u8::from(Self::SetExcInfo),
u8::from(Self::Subscript),
];

// Pseudo opcodes (252-255)
let pseudo_start = u8::from(Self::Jump {
target: Arg::marker(),
});
let pseudo_end = u8::from(Self::PopBlock);

if (cpython_start..=cpython_end).contains(&value)
|| value == resume_id
|| (custom_start..=custom_end).contains(&value)
|| custom_ops.contains(&value)
|| (pseudo_start..=pseudo_end).contains(&value)
{
Ok(unsafe { core::mem::transmute::<u8, Self>(value) })
Expand Down
Loading