FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Materialize code constants through the VM (#8867) · RustPython/RustPython@c8d63e8 · GitHub

  1. RustPython
  2. RustPython

Repository navigation

Commit c8d63e8

Browse files
youknowone
authored
Materialize code constants through the VM (#8867)
PyObjBag built code object constants from a Context alone, and its frozenset arm was unimplemented!(), so ctx.new_code() panicked on code containing a frozenset constant such as `x in {1, 2, 3}`. IntoCodeObject now takes a VirtualMachine and uses PyVmBag for bytecode and frozen code objects. Context::new_code, PyObjBag and AsBag for &Context are removed; callers use VirtualMachine::new_code. Assisted-by: Claude:claude-opus-5-5 Assisted-by: Grok:grok-4.7
1 parent d88c344 commit c8d63e8

8 files changed

Lines changed: 49 additions & 100 deletions

File tree

‎crates/vm/src/builtins/code.rs‎

Lines changed: 8 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use crate::convert::ToPyException;
88
use crate::{
99
AsObject, Context, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine,
1010
builtins::PyStrInterned,
11-
bytecode::{self, AsBag, BorrowedConstant, CodeFlags, Constant, ConstantBag, Instruction},
11+
bytecode::{self, BorrowedConstant, CodeFlags, Constant, ConstantBag, Instruction},
1212
class::{PyClassImpl, StaticType},
1313
convert::ToPyObject,
1414
frozen,
@@ -263,16 +263,6 @@ impl Constant for Literal {
263263
}
264264
}
265265

266-
impl<'a> AsBag for &'a Context {
267-
type Bag = PyObjBag<'a>;
268-
fn as_bag(self) -> PyObjBag<'a> {
269-
PyObjBag(self)
270-
}
271-
}
272-
273-
#[derive(Clone, Copy)]
274-
pub struct PyObjBag<'a>(pub &'a Context);
275-
276266
/// Whether a string constant reads as a name. Those are the ones interned,
277267
/// the way `all_name_chars` picks them out.
278268
fn is_name_chars(value: &crate::common::wtf8::Wtf8) -> bool {
@@ -282,77 +272,6 @@ fn is_name_chars(value: &crate::common::wtf8::Wtf8) -> bool {
282272
.all(|&b| b.is_ascii_alphanumeric() || b == b'_')
283273
}
284274

285-
impl ConstantBag for PyObjBag<'_> {
286-
type Constant = Literal;
287-
288-
fn make_constant<C: Constant>(&self, constant: BorrowedConstant<'_, C>) -> Self::Constant {
289-
let ctx = self.0;
290-
let obj = match constant {
291-
BorrowedConstant::Integer { value } => ctx.new_bigint(value).into(),
292-
BorrowedConstant::Float { value } => ctx.new_float(value).into(),
293-
BorrowedConstant::Complex { value } => ctx.new_complex(value).into(),
294-
BorrowedConstant::Str { value } if is_name_chars(value) => {
295-
ctx.intern_str(value).to_object()
296-
}
297-
BorrowedConstant::Str { value } => ctx.new_str(value).into(),
298-
BorrowedConstant::Bytes { value } => ctx.new_bytes(value.to_vec()).into(),
299-
BorrowedConstant::Boolean { value } => ctx.new_bool(value).into(),
300-
BorrowedConstant::Code { code } => ctx.new_code(code.map_clone_bag(self)).into(),
301-
BorrowedConstant::Tuple { elements } => {
302-
let elements = elements
303-
.iter()
304-
.map(|constant| self.make_constant(constant.borrow_constant()).0)
305-
.collect();
306-
ctx.new_tuple(elements).into()
307-
}
308-
BorrowedConstant::Slice { elements } => {
309-
let [start, stop, step] = elements;
310-
let start_obj = self.make_constant(start.borrow_constant()).0;
311-
let stop_obj = self.make_constant(stop.borrow_constant()).0;
312-
let step_obj = self.make_constant(step.borrow_constant()).0;
313-
// Store as PySlice with Some() for all fields (even None values)
314-
// so borrow_obj_constant can reference them.
315-
use crate::builtins::PySlice;
316-
PySlice {
317-
start: Some(start_obj),
318-
stop: stop_obj,
319-
step: Some(step_obj),
320-
}
321-
.into_ref(ctx)
322-
.into()
323-
}
324-
BorrowedConstant::Frozenset { elements: _ } => {
325-
// Creating a frozenset requires VirtualMachine for element hashing.
326-
// PyObjBag only has Context, so we cannot construct PyFrozenSet here.
327-
// Frozenset constants from .pyc are handled by PyMarshalBag which has VM access.
328-
unimplemented!(
329-
"frozenset constant in PyObjBag::make_constant requires VirtualMachine"
330-
)
331-
}
332-
BorrowedConstant::None => ctx.none(),
333-
BorrowedConstant::Ellipsis => ctx.ellipsis.clone().into(),
334-
};
335-
336-
Literal(obj)
337-
}
338-
339-
fn make_name(&self, name: &str) -> &'static PyStrInterned {
340-
self.0.intern_str(name)
341-
}
342-
343-
fn make_int(&self, value: BigInt) -> Self::Constant {
344-
Literal(self.0.new_int(value).into())
345-
}
346-
347-
fn make_tuple(&self, elements: impl Iterator<Item = Self::Constant>) -> Self::Constant {
348-
Literal(self.0.new_tuple(elements.map(|lit| lit.0).collect()).into())
349-
}
350-
351-
fn make_code(&self, code: CodeObject) -> Self::Constant {
352-
Literal(self.0.new_code(code).into())
353-
}
354-
}
355-
356275
#[derive(Clone, Copy)]
357276
pub(crate) struct PyVmBag<'a>(pub &'a VirtualMachine);
358277

@@ -437,24 +356,24 @@ impl ConstantBag for PyVmBag<'_> {
437356
pub(crate) type CodeObject = bytecode::CodeObject<Literal>;
438357

439358
pub trait IntoCodeObject {
440-
fn into_code_object(self, ctx: &Context) -> CodeObject;
359+
fn into_code_object(self, vm: &VirtualMachine) -> CodeObject;
441360
}
442361

443362
impl IntoCodeObject for CodeObject {
444-
fn into_code_object(self, _ctx: &Context) -> Self {
363+
fn into_code_object(self, _vm: &VirtualMachine) -> Self {
445364
self
446365
}
447366
}
448367

449368
impl IntoCodeObject for bytecode::CodeObject {
450-
fn into_code_object(self, ctx: &Context) -> CodeObject {
451-
self.map_bag(PyObjBag(ctx))
369+
fn into_code_object(self, vm: &VirtualMachine) -> CodeObject {
370+
self.map_bag(PyVmBag(vm))
452371
}
453372
}
454373

455374
impl<B: AsRef<[u8]>> IntoCodeObject for frozen::FrozenCodeObject<B> {
456-
fn into_code_object(self, ctx: &Context) -> CodeObject {
457-
self.decode(ctx)
375+
fn into_code_object(self, vm: &VirtualMachine) -> CodeObject {
376+
self.decode(PyVmBag(vm))
458377
}
459378
}
460379

@@ -1645,7 +1564,7 @@ impl Py<PyCode> {
16451564

16461565
impl ToPyObject for CodeObject {
16471566
fn to_pyobject(self, vm: &VirtualMachine) -> PyObjectRef {
1648-
vm.ctx.new_code(self).into()
1567+
vm.new_code(self).into()
16491568
}
16501569
}
16511570

‎crates/vm/src/stdlib/_testinternalcapi.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -931,7 +931,7 @@ mod _testinternalcapi {
931931
let unit = super::metadata_to_code_unit(&metadata, vm)?;
932932
let code = rustpython_codegen::ir::assemble_for_tests(filename, rust_seq, unit, true)
933933
.map_err(|err| super::internal_error_to_py(err, vm))?;
934-
Ok(vm.ctx.new_code(code))
934+
Ok(vm.new_code(code))
935935
}
936936

937937
#[cfg(feature = "codegen")]
@@ -1736,7 +1736,7 @@ fn constant_data_to_py(
17361736
)
17371737
.map_or_else(|_| vm.ctx.none(), |set| set.to_pyobject(vm)),
17381738
ConstantData::Ellipsis => vm.ctx.ellipsis.clone().into(),
1739-
ConstantData::Code { code } => vm.ctx.new_code(*code).into(),
1739+
ConstantData::Code { code } => vm.new_code(*code).into(),
17401740
ConstantData::Slice { elements } => {
17411741
let [start, stop, step] = *elements;
17421742
crate::builtins::PySlice {

‎crates/vm/src/vm/context.rs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use crate::{
55
PyFrozenSet, PyInt, PyIntRef, PyList, PyListRef, PyNone, PyNotImplemented, PyStr,
66
PyStrInterned, PyTuple, PyTupleRef, PyType, PyTypeRef, PyUtf8Str,
77
bool_::PyBool,
8-
code::{self, PyCode},
98
descriptor::{
109
MemberAccess, MemberKind, PyDescriptorOwned, PyMemberDef, PyMemberDescriptor,
1110
PyMemberFlags,
@@ -781,11 +780,6 @@ impl Context {
781780
PyRef::new_ref(object::PyBaseObject, class, dict).into()
782781
}
783782

784-
pub fn new_code(&self, code: impl code::IntoCodeObject) -> PyRef<PyCode> {
785-
let code = code.into_code_object(self);
786-
PyRef::new_ref(PyCode::new(code), self.types.code_type.to_owned(), None)
787-
}
788-
789783
pub fn new_capsule(
790784
&self,
791785
ptr: *mut c_void,

‎crates/vm/src/vm/interpreter.rs‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2163,4 +2163,34 @@ for _ in range(40):
21632163
assert!(result.try_to_bool(vm).unwrap());
21642164
});
21652165
}
2166+
2167+
/// Set and `for` literals become frozenset constants. Materializing them
2168+
/// needs the VM so element hashing can run.
2169+
#[cfg(feature = "compiler")]
2170+
#[test]
2171+
fn new_code_materializes_frozenset_constants() {
2172+
Interpreter::without_stdlib(Default::default()).enter(|vm| {
2173+
let source = "\
2174+
a = 2 in {1, 2, 3}
2175+
n = 0
2176+
for e in {1, 2, 3}:
2177+
n += e
2178+
";
2179+
let code = crate::compiler::compile(
2180+
source,
2181+
crate::compiler::Mode::Exec,
2182+
"<test>",
2183+
vm.compile_opts(),
2184+
)
2185+
.unwrap();
2186+
let code = vm.new_code(code);
2187+
let scope = vm.new_scope_with_builtins();
2188+
vm.run_code_obj(code, scope.clone()).unwrap();
2189+
2190+
let a = scope.globals.get_item("a", vm).unwrap();
2191+
assert!(a.is(&vm.ctx.true_value));
2192+
let n = scope.globals.get_item("n", vm).unwrap();
2193+
assert_eq!(*int::get_value(&n), 6_i32.to_bigint().unwrap());
2194+
})
2195+
}
21662196
}

‎crates/vm/src/vm/vm_new.rs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ use crate::{
1818
PyImportError, PyMemoryError, PyModule, PyNameError, PyOSError, PyStopIteration, PyStrRef,
1919
PySyntaxError, PySystemExit, PyType, PyTypeRef,
2020
builtin_func::PyNativeFunction,
21+
code::{IntoCodeObject, PyCode},
2122
descriptor::PyMethodDescriptor,
2223
tuple::{IntoPyTuple, PyTupleRef},
2324
},
@@ -311,6 +312,11 @@ impl VirtualMachine {
311312
value.to_pyobject(self)
312313
}
313314

315+
pub fn new_code(&self, code: impl IntoCodeObject) -> PyRef<PyCode> {
316+
let code = code.into_code_object(self);
317+
PyRef::new_ref(PyCode::new(code), self.ctx.types.code_type.to_owned(), None)
318+
}
319+
314320
pub fn new_tuple(&self, value: impl IntoPyTuple) -> PyTupleRef {
315321
value.into_pytuple(self)
316322
}

‎examples/freeze/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ fn run(vm: &vm::VirtualMachine) -> vm::PyResult<()> {
1111
// the file parameter is relative to the current file.
1212
let module = vm::py_compile!(file = "freeze.py");
1313

14-
let res = vm.run_code_obj(vm.ctx.new_code(module), scope);
14+
let res = vm.run_code_obj(vm.new_code(module), scope);
1515

1616
if let Err(exc) = res {
1717
vm.print_exception(&exc);

‎examples/mini_repl.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ macro_rules! add_python_function {
1616
// compile the code to bytecode
1717
let code = vm::py_compile!(source = $src);
1818
// convert the rustpython_compiler_core::CodeObject to a PyRef<PyCode>
19-
let code = $vm.ctx.new_code(code);
19+
let code = $vm.new_code(code);
2020

2121
// run the python code in the scope to store the function
2222
$vm.run_code_obj(code, $scope.clone())

‎src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ __import__("io").TextIOWrapper(
143143
mode = "eval"
144144
);
145145
eprintln!("downloading get-pip.py...");
146-
let getpip_code = vm.run_code_obj(vm.ctx.new_code(get_getpip), vm.new_scope_with_builtins())?;
146+
let getpip_code = vm.run_code_obj(vm.new_code(get_getpip), vm.new_scope_with_builtins())?;
147147
let getpip_code: rustpython_vm::builtins::PyStrRef = getpip_code
148148
.downcast()
149149
.expect("TextIOWrapper.read() should return str");

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL