Skip to content

Reduce usage JumpIfTrueOrPop & JumpIfFalseOrPop opcdes. Refactor compile_compare #6524

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 8 commits into from
Dec 26, 2025
Merged

Reduce usage JumpIfTrueOrPop & JumpIfFalseOrPop opcdes. Refactor compile_compare #6524

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1445698
Remove `JumpIfTrueOrPop` & `JumpIfFalseOrPop` opcdes
ShaharNaveh Dec 25, 2025
70ef6d0
Merge remote-tracking branch 'upstream/main' into bytecode-remove-jum…
ShaharNaveh Dec 25, 2025
62259f3
Use correct instruction name
ShaharNaveh Dec 25, 2025
999f6ac
Extract `compile_cmpop` to its own method
ShaharNaveh Dec 25, 2025
186b914
Better alignment with CPython code
ShaharNaveh Dec 26, 2025
a1399bc
Merge remote-tracking branch 'upstream/main' into bytecode-remove-jum…
ShaharNaveh Dec 26, 2025
48f3772
Restore `PopJumpIf` instructions
ShaharNaveh Dec 26, 2025
582d1e0
Revert PopJumpIfFalse for comparisons
ShaharNaveh Dec 26, 2025
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
Extract compile_cmpop to its own method
  • Loading branch information
@ShaharNaveh
ShaharNaveh committed Dec 25, 2025
commit 999f6ac380877b6f7fc1c4e7574b90cf716eef37
38 changes: 20 additions & 18 deletions crates/codegen/src/compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4046,6 +4046,24 @@ impl Compiler {
Ok(())
}

fn compile_cmpop(&mut self, op: &CmpOp) {
use bytecode::ComparisonOperator::*;
match op {
CmpOp::Eq => emit!(self, Instruction::CompareOperation { op: Equal }),
CmpOp::NotEq => emit!(self, Instruction::CompareOperation { op: NotEqual }),
CmpOp::Lt => emit!(self, Instruction::CompareOperation { op: Less }),
CmpOp::LtE => emit!(self, Instruction::CompareOperation { op: LessOrEqual }),
CmpOp::Gt => emit!(self, Instruction::CompareOperation { op: Greater }),
CmpOp::GtE => {
emit!(self, Instruction::CompareOperation { op: GreaterOrEqual })
}
CmpOp::In => emit!(self, Instruction::ContainsOp(Invert::No)),
CmpOp::NotIn => emit!(self, Instruction::ContainsOp(Invert::Yes)),
CmpOp::Is => emit!(self, Instruction::IsOp(Invert::No)),
CmpOp::IsNot => emit!(self, Instruction::IsOp(Invert::Yes)),
}
}

fn compile_chained_comparison(
&mut self,
left: &Expr,
Expand All @@ -4057,22 +4075,6 @@ impl Compiler {
let (last_op, mid_ops) = ops.split_last().unwrap();
let (last_val, mid_exprs) = exprs.split_last().unwrap();

use bytecode::ComparisonOperator::*;
let compile_cmpop = |c: &mut Self, op: &CmpOp| match op {
CmpOp::Eq => emit!(c, Instruction::CompareOperation { op: Equal }),
CmpOp::NotEq => emit!(c, Instruction::CompareOperation { op: NotEqual }),
CmpOp::Lt => emit!(c, Instruction::CompareOperation { op: Less }),
CmpOp::LtE => emit!(c, Instruction::CompareOperation { op: LessOrEqual }),
CmpOp::Gt => emit!(c, Instruction::CompareOperation { op: Greater }),
CmpOp::GtE => {
emit!(c, Instruction::CompareOperation { op: GreaterOrEqual })
}
CmpOp::In => emit!(c, Instruction::ContainsOp(Invert::No)),
CmpOp::NotIn => emit!(c, Instruction::ContainsOp(Invert::Yes)),
CmpOp::Is => emit!(c, Instruction::IsOp(Invert::No)),
CmpOp::IsNot => emit!(c, Instruction::IsOp(Invert::Yes)),
};

// a == b == c == d
// compile into (pseudo code):
// result = a == b
Expand All @@ -4099,7 +4101,7 @@ impl Compiler {
emit!(self, Instruction::Swap { index: 2 });
emit!(self, Instruction::CopyItem { index: 2_u32 });

compile_cmpop(self, op);
self.compile_cmpop(op);

// if comparison result is false, we break with this value; if true, try the next one.
if let Some((break_block, _)) = end_blocks {
Expand All @@ -4116,7 +4118,7 @@ impl Compiler {

// handle the last comparison
self.compile_expression(last_val)?;
compile_cmpop(self, last_op);
self.compile_cmpop(last_op);

if let Some((break_block, after_block)) = end_blocks {
emit!(
Expand Down