Sitelet https://github.com/RustPython/RustPython/pull/7916/commits/899fac4a9b8ac57557a47c0d4e246732198953e6
Skip to content

Fix "tried to pop from empty stack" with BlockExpr and const #7916

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 2 commits into from
May 19, 2026
Merged

Fix "tried to pop from empty stack" with BlockExpr and const #7916

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
899fac4
Add tests for Mode::BlockExpr and VirtualMachine::run_block_expr
im-0 May 18, 2026
239ff88
Fix "tried to pop from empty stack" with BlockExpr and const
im-0 May 17, 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
Add tests for Mode::BlockExpr and VirtualMachine::run_block_expr 
test_block_expr_return_const() panics currently.
  • Loading branch information
@im-0
im-0 committed May 18, 2026
commit 899fac4a9b8ac57557a47c0d4e246732198953e6
32 changes: 32 additions & 0 deletions crates/vm/src/vm/python_run.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,3 +174,35 @@ mod file_run {
Ok(crate::import::check_pyc_magic_number_bytes(&buf))
}
}

#[cfg(test)]
mod tests {
use rustpython_vm::Interpreter;

fn interpreter() -> Interpreter {
Interpreter::without_stdlib(Default::default())
}

#[test]
fn test_block_expr_return_const() {
interpreter().enter(|vm| {
let scope = vm.new_scope_with_builtins();
let value = vm.unwrap_pyresult(vm.run_block_expr(scope, "1"));
let value = vm.unwrap_pyresult(value.try_int(vm));
let value: u32 = vm.unwrap_pyresult(value.try_to_primitive(vm));
assert_eq!(value, 1);
})
}

#[test]
fn test_block_expr_return_nonconst() {
interpreter().enter(|vm| {
let scope = vm.new_scope_with_builtins();
vm.unwrap_pyresult(scope.globals.set_item("x", vm.new_pyobj(3), vm));
let value = vm.unwrap_pyresult(vm.run_block_expr(scope, "2 + x"));
let value = vm.unwrap_pyresult(value.try_int(vm));
let value: u32 = vm.unwrap_pyresult(value.try_to_primitive(vm));
assert_eq!(value, 5);
})
}
}