Visitar URL original
Bytecode parity by youknowone · Pull Request #7504 · RustPython/RustPython · GitHub
Skip to content

Bytecode parity #7504

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 15 commits into from
Mar 25, 2026
Merged

Bytecode parity #7504

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a6aab76
Match CPython LOAD_SPECIAL stack semantics for with/async-with
youknowone Mar 23, 2026
d015f02
Normalize LOAD_FAST_CHECK and JUMP_BACKWARD_NO_INTERRUPT
youknowone Mar 23, 2026
37d1e03
Add EXTENDED_ARG to SKIP_OPS, normalize LOAD_FAST_CHECK and JUMP_BACK…
youknowone Mar 23, 2026
b559a6e
Remove duplicate return-None when block already has return
youknowone Mar 23, 2026
6b200d9
Improve __static_attributes__ collection accuracy
youknowone Mar 23, 2026
122f76a
Use method mode for function-local import attribute calls
youknowone Mar 25, 2026
d1641dd
Optimize constant iterable before GET_ITER to LOAD_CONST tuple
youknowone Mar 25, 2026
5b19b70
Fix cell variable ordering: parameters first, then alphabetical
youknowone Mar 25, 2026
5b32c68
Emit COPY_FREE_VARS before MAKE_CELL matching CPython order
youknowone Mar 25, 2026
96462fa
Fix RESUME AfterYield encoding to match CPython 3.14 (value 5)
youknowone Mar 25, 2026
296eaa1
Address code review feedback from #7481
youknowone Mar 25, 2026
b2eaa71
Fold constant list/set/tuple literals in compiler
youknowone Mar 23, 2026
c7f505d
Use BUILD_MAP 0 + MAP_ADD for large dicts (>= 16 pairs)
youknowone Mar 23, 2026
a23315a
Fix clippy warnings and cargo fmt
youknowone Mar 25, 2026
cab59e7
fix surrogate
youknowone Mar 25, 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
Next Next commit
Match CPython LOAD_SPECIAL stack semantics for with/async-with 
LOAD_SPECIAL now pushes (callable, self_or_null) matching CPython's
CALL convention, instead of a single bound method:
- Function descriptors: push (func, self)
- Plain attributes: push (bound, NULL)

Updated all with-statement paths:
- Entry: add SWAP 3 after SWAP 2, remove PUSH_NULL before CALL 0
- Normal exit: remove PUSH_NULL before CALL 3
- Exception handler (WITH_EXCEPT_START): read exit_func at TOS-4
  and self_or_null at TOS-3
- Suppress block: 3 POP_TOPs after POP_EXCEPT (was 2)
- FBlock exit (preserve_tos): SWAP 3 + SWAP 2 rotation
- UnwindAction::With: remove PUSH_NULL

Stack effects updated: LoadSpecial (2,1), WithExceptStart (7,6)
  • Loading branch information
@youknowone
youknowone committed Mar 25, 2026
commit a6aab76d23ee4bbe82987012d9777a29d0051bb6
74 changes: 28 additions & 46 deletions crates/codegen/src/compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1476,25 +1476,20 @@ impl Compiler {
}

FBlockType::With | FBlockType::AsyncWith => {
// Stack when entering: [..., __exit__, return_value (if preserve_tos)]
// Need to call __exit__(None, None, None)

// Stack: [..., exit_func, self_exit, return_value (if preserve_tos)]
emit!(self, PseudoInstruction::PopBlock);

// If preserving return value, swap it below __exit__
if preserve_tos {
emit!(self, Instruction::Swap { i: 2 });
// Rotate return value below the exit pair
// [exit_func, self_exit, value] → [value, exit_func, self_exit]
emit!(self, Instruction::Swap { i: 3 }); // [value, self_exit, exit_func]
emit!(self, Instruction::Swap { i: 2 }); // [value, exit_func, self_exit]
}
// Stack after swap: [..., return_value, __exit__] or [..., __exit__]

// Call __exit__(None, None, None)
// Call protocol: [callable, self_or_null, arg1, arg2, arg3]
emit!(self, Instruction::PushNull);
// Stack: [..., __exit__, NULL]
// Call exit_func(self_exit, None, None, None)
self.emit_load_const(ConstantData::None);
self.emit_load_const(ConstantData::None);
self.emit_load_const(ConstantData::None);
// Stack: [..., __exit__, NULL, None, None, None]
emit!(self, Instruction::Call { argc: 3 });

// For async with, await the result
Expand Down Expand Up @@ -5180,16 +5175,16 @@ impl Compiler {
Instruction::LoadSpecial {
method: SpecialMethod::AExit
}
); // [cm, bound_aexit]
emit!(self, Instruction::Swap { i: 2 }); // [bound_aexit, cm]
); // [cm, aexit_func, self_ae]
emit!(self, Instruction::Swap { i: 2 }); // [cm, self_ae, aexit_func]
emit!(self, Instruction::Swap { i: 3 }); // [aexit_func, self_ae, cm]
emit!(
self,
Instruction::LoadSpecial {
method: SpecialMethod::AEnter
}
); // [bound_aexit, bound_aenter]
emit!(self, Instruction::PushNull);
emit!(self, Instruction::Call { argc: 0 }); // [bound_aexit, awaitable]
); // [aexit_func, self_ae, aenter_func, self_an]
emit!(self, Instruction::Call { argc: 0 }); // [aexit_func, self_ae, awaitable]
emit!(self, Instruction::GetAwaitable { r#where: 1 });
self.emit_load_const(ConstantData::None);
let _ = self.compile_yield_from_sequence(true)?;
Expand All @@ -5200,16 +5195,16 @@ impl Compiler {
Instruction::LoadSpecial {
method: SpecialMethod::Exit
}
); // [cm, bound_exit]
emit!(self, Instruction::Swap { i: 2 }); // [bound_exit, cm]
); // [cm, exit_func, self_exit]
emit!(self, Instruction::Swap { i: 2 }); // [cm, self_exit, exit_func]
emit!(self, Instruction::Swap { i: 3 }); // [exit_func, self_exit, cm]
emit!(
self,
Instruction::LoadSpecial {
method: SpecialMethod::Enter
}
); // [bound_exit, bound_enter]
emit!(self, Instruction::PushNull);
emit!(self, Instruction::Call { argc: 0 }); // [bound_exit, enter_result]
); // [exit_func, self_exit, enter_func, self_enter]
emit!(self, Instruction::Call { argc: 0 }); // [exit_func, self_exit, result]
}

// Stack: [..., __exit__, enter_result]
Expand Down Expand Up @@ -5263,10 +5258,9 @@ impl Compiler {
});

// ===== Normal exit path =====
// Stack: [..., bound_exit]
// Call bound_exit(None, None, None)
// Stack: [..., exit_func, self_exit]
// Call exit_func(self_exit, None, None, None)
self.set_source_range(with_range);
emit!(self, Instruction::PushNull);
self.emit_load_const(ConstantData::None);
self.emit_load_const(ConstantData::None);
self.emit_load_const(ConstantData::None);
Expand All @@ -5280,11 +5274,10 @@ impl Compiler {
emit!(self, PseudoInstruction::Jump { delta: after_block });

// ===== Exception handler path =====
// Stack at entry (after unwind): [..., __exit__, lasti, exc]
// PUSH_EXC_INFO -> [..., __exit__, lasti, prev_exc, exc]
// Stack at entry: [..., exit_func, self_exit, lasti, exc]
// PUSH_EXC_INFO -> [..., exit_func, self_exit, lasti, prev_exc, exc]
self.switch_to_block(exc_handler_block);

// Create blocks for exception handling
let cleanup_block = self.new_block();
let suppress_block = self.new_block();

Expand All @@ -5296,12 +5289,10 @@ impl Compiler {
);
self.push_fblock(FBlockType::ExceptionHandler, exc_handler_block, after_block)?;

// PUSH_EXC_INFO: [exc] -> [prev_exc, exc]
emit!(self, Instruction::PushExcInfo);

// WITH_EXCEPT_START: call __exit__(type, value, tb)
// Stack: [..., __exit__, lasti, prev_exc, exc]
// __exit__ is at TOS-3, call with exception info
// WITH_EXCEPT_START: call exit_func(self_exit, type, value, tb)
// Stack: [..., exit_func, self_exit, lasti, prev_exc, exc]
emit!(self, Instruction::WithExceptStart);

if is_async {
Expand All @@ -5310,7 +5301,6 @@ impl Compiler {
let _ = self.compile_yield_from_sequence(true)?;
}

// TO_BOOL + POP_JUMP_IF_TRUE: check if exception is suppressed
emit!(self, Instruction::ToBool);
emit!(
self,
Expand All @@ -5319,25 +5309,19 @@ impl Compiler {
}
);

// Pop the nested fblock BEFORE RERAISE so that RERAISE's exception
// handler points to the outer handler (try-except), not cleanup_block.
// This is critical: when RERAISE propagates the exception, the exception
// table should route it to the outer try-except, not back to cleanup.
emit!(self, PseudoInstruction::PopBlock);
self.pop_fblock(FBlockType::ExceptionHandler);

// Not suppressed: RERAISE 2
emit!(self, Instruction::Reraise { depth: 2 });

// ===== Suppress block =====
// Exception was suppressed, clean up stack
// Stack: [..., __exit__, lasti, prev_exc, exc, True]
// Need to pop: True, exc, prev_exc, __exit__
// Stack: [..., exit_func, self_exit, lasti, prev_exc, exc, True]
self.switch_to_block(suppress_block);
emit!(self, Instruction::PopTop); // pop True (TO_BOOL result)
emit!(self, Instruction::PopExcept); // pop exc and restore prev_exc
emit!(self, Instruction::PopTop); // pop __exit__
emit!(self, Instruction::PopTop); // pop True
emit!(self, Instruction::PopExcept); // pop exc, restore prev_exc
emit!(self, Instruction::PopTop); // pop lasti
emit!(self, Instruction::PopTop); // pop self_exit
emit!(self, Instruction::PopTop); // pop exit_func
emit!(self, PseudoInstruction::Jump { delta: after_block });

// ===== Cleanup block (for nested exception during __exit__) =====
Expand Down Expand Up @@ -8740,10 +8724,8 @@ impl Compiler {
for action in unwind_actions {
match action {
UnwindAction::With { is_async } => {
// codegen_unwind_fblock(WITH/ASYNC_WITH)
// Stack: [..., exit_func, self_exit]
emit!(self, PseudoInstruction::PopBlock);
// compiler_call_exit_with_nones
emit!(self, Instruction::PushNull);
self.emit_load_const(ConstantData::None);
self.emit_load_const(ConstantData::None);
self.emit_load_const(ConstantData::None);
Expand Down
131 changes: 66 additions & 65 deletions ...s/codegen/src/snapshots/rustpython_codegen__compile__tests__nested_double_async_with.snap
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions crates/compiler-core/src/bytecode/instruction.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,7 +1020,7 @@ impl InstructionMetadata for Instruction {
Self::LoadLocals => (1, 0),
Self::LoadName { .. } => (1, 0),
Self::LoadSmallInt { .. } => (1, 0),
Self::LoadSpecial { .. } => (1, 1),
Self::LoadSpecial { .. } => (2, 1),
Self::LoadSuperAttr { .. } => (1 + (oparg & 1), 3),
Self::LoadSuperAttrAttr => (1, 3),
Self::LoadSuperAttrMethod => (2, 3),
Expand Down Expand Up @@ -1085,7 +1085,7 @@ impl InstructionMetadata for Instruction {
Self::UnpackSequenceList => (oparg, 1),
Self::UnpackSequenceTuple => (oparg, 1),
Self::UnpackSequenceTwoTuple => (2, 1),
Self::WithExceptStart => (6, 5),
Self::WithExceptStart => (7, 6),
Self::YieldValue { .. } => (1, 1),
};

Expand Down
Loading