Skip to content

Align opcode names in dis #6526

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 6 commits into from
Dec 25, 2025
Merged

Align opcode names in dis #6526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9b67d41
opcodes dis repr like cpython. POP-> POP_TOP
ShaharNaveh Dec 25, 2025
ea875f8
Adjust frame.rs
ShaharNaveh Dec 25, 2025
5a816bb
Fix codegen
ShaharNaveh Dec 25, 2025
01dd81a
snapshots
ShaharNaveh Dec 25, 2025
2e220f9
Add doc for `PopTop`
ShaharNaveh Dec 25, 2025
e5abd45
fix jit
ShaharNaveh Dec 25, 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
46 changes: 23 additions & 23 deletions crates/codegen/src/compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1063,7 +1063,7 @@ impl Compiler {
}
);

emit!(self, Instruction::Pop);
emit!(self, Instruction::PopTop);
} else {
self.compile_statement(statement)?;
}
Expand All @@ -1079,7 +1079,7 @@ impl Compiler {
}
);

emit!(self, Instruction::Pop);
emit!(self, Instruction::PopTop);
} else {
self.compile_statement(last)?;
self.emit_load_const(ConstantData::None);
Expand All @@ -1104,7 +1104,7 @@ impl Compiler {
if let Some(last_statement) = body.last() {
match last_statement {
Stmt::Expr(_) => {
self.current_block().instructions.pop(); // pop Instruction::Pop
self.current_block().instructions.pop(); // pop Instruction::PopTop
}
Stmt::FunctionDef(_) | Stmt::ClassDef(_) => {
let pop_instructions = self.current_block().instructions.pop();
Expand Down Expand Up @@ -1401,14 +1401,14 @@ impl Compiler {
}

// Pop module from stack:
emit!(self, Instruction::Pop);
emit!(self, Instruction::PopTop);
}
}
Stmt::Expr(StmtExpr { value, .. }) => {
self.compile_expression(value)?;

// Pop result of stack, since we not use it:
emit!(self, Instruction::Pop);
emit!(self, Instruction::PopTop);
}
Stmt::Global(_) | Stmt::Nonlocal(_) => {
// Handled during symbol table construction.
Expand Down Expand Up @@ -2051,12 +2051,12 @@ impl Compiler {
self.store_name(alias.as_str())?
} else {
// Drop exception from top of stack:
emit!(self, Instruction::Pop);
emit!(self, Instruction::PopTop);
}
} else {
// Catch all!
// Drop exception from top of stack:
emit!(self, Instruction::Pop);
emit!(self, Instruction::PopTop);
}

// Handler code:
Expand Down Expand Up @@ -2950,7 +2950,7 @@ impl Compiler {
self.compile_store(var)?;
}
None => {
emit!(self, Instruction::Pop);
emit!(self, Instruction::PopTop);
}
}
final_block
Expand Down Expand Up @@ -3143,7 +3143,7 @@ impl Compiler {
for &label in pc.fail_pop.iter().skip(1).rev() {
self.switch_to_block(label);
// Emit the POP instruction.
emit!(self, Instruction::Pop);
emit!(self, Instruction::PopTop);
}
// Finally, use the first label.
self.switch_to_block(pc.fail_pop[0]);
Expand Down Expand Up @@ -3187,7 +3187,7 @@ impl Compiler {
match n {
// If no name is provided, simply pop the top of the stack.
None => {
emit!(self, Instruction::Pop);
emit!(self, Instruction::PopTop);
Ok(())
}
Some(name) => {
Expand Down Expand Up @@ -3313,7 +3313,7 @@ impl Compiler {
}
// Pop the subject off the stack.
pc.on_top -= 1;
emit!(self, Instruction::Pop);
emit!(self, Instruction::PopTop);
Ok(())
}

Expand Down Expand Up @@ -3497,7 +3497,7 @@ impl Compiler {
pc.on_top -= 1;

if is_true_wildcard {
emit!(self, Instruction::Pop);
emit!(self, Instruction::PopTop);
continue; // Don't compile wildcard patterns
}

Expand Down Expand Up @@ -3548,7 +3548,7 @@ impl Compiler {
if size == 0 && star_target.is_none() {
// If the pattern is just "{}", we're done! Pop the subject
pc.on_top -= 1;
emit!(self, Instruction::Pop);
emit!(self, Instruction::PopTop);
return Ok(());
}

Expand Down Expand Up @@ -3703,8 +3703,8 @@ impl Compiler {
// Non-rest pattern: just clean up the stack

// Pop them as we're not using them
emit!(self, Instruction::Pop); // Pop keys_tuple
emit!(self, Instruction::Pop); // Pop subject
emit!(self, Instruction::PopTop); // Pop keys_tuple
emit!(self, Instruction::PopTop); // Pop subject
}

Ok(())
Expand Down Expand Up @@ -3792,7 +3792,7 @@ impl Compiler {
// In Rust, old_pc is a local clone, so we need not worry about that.

// No alternative matched: pop the subject and fail.
emit!(self, Instruction::Pop);
emit!(self, Instruction::PopTop);
self.jump_to_fail_pop(pc, JumpOp::Jump)?;

// Use the label "end".
Expand All @@ -3814,7 +3814,7 @@ impl Compiler {

// Old context and control will be dropped automatically.
// Finally, pop the copy of the subject.
emit!(self, Instruction::Pop);
emit!(self, Instruction::PopTop);
Ok(())
}

Expand Down Expand Up @@ -3888,7 +3888,7 @@ impl Compiler {
pc.on_top -= 1;
if only_wildcard {
// Patterns like: [] / [_] / [_, _] / [*_] / [_, *_] / [_, _, *_] / etc.
emit!(self, Instruction::Pop);
emit!(self, Instruction::PopTop);
} else if star_wildcard {
self.pattern_helper_sequence_subscr(patterns, star.unwrap(), pc)?;
} else {
Expand Down Expand Up @@ -4012,7 +4012,7 @@ impl Compiler {
}

if i != case_count - 1 {
emit!(self, Instruction::Pop);
emit!(self, Instruction::PopTop);
}

self.compile_statements(&m.body)?;
Expand All @@ -4023,7 +4023,7 @@ impl Compiler {
if has_default {
let m = &cases[num_cases - 1];
if num_cases == 1 {
emit!(self, Instruction::Pop);
emit!(self, Instruction::PopTop);
} else {
emit!(self, Instruction::Nop);
}
Expand Down Expand Up @@ -4125,7 +4125,7 @@ impl Compiler {
// early exit left us with stack: `rhs, comparison_result`. We need to clean up rhs.
self.switch_to_block(break_block);
emit!(self, Instruction::Swap { index: 2 });
emit!(self, Instruction::Pop);
emit!(self, Instruction::PopTop);

self.switch_to_block(after_block);
}
Expand Down Expand Up @@ -4192,7 +4192,7 @@ impl Compiler {
emit!(self, Instruction::StoreSubscript);
} else {
// Drop annotation if not assigned to simple identifier.
emit!(self, Instruction::Pop);
emit!(self, Instruction::PopTop);
}

Ok(())
Expand Down Expand Up @@ -4823,7 +4823,7 @@ impl Compiler {
arg: bytecode::ResumeType::AfterYield as u32
}
);
emit!(compiler, Instruction::Pop);
emit!(compiler, Instruction::PopTop);

Ok(())
},
Expand Down
16 changes: 8 additions & 8 deletions crates/codegen/src/snapshots/rustpython_codegen__compile__tests__if_ands.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions crates/codegen/src/snapshots/rustpython_codegen__compile__tests__if_mixed.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions crates/codegen/src/snapshots/rustpython_codegen__compile__tests__if_ors.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading