Skip to content

Fix panic in code.replace() with non-interned strings #8471

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 1 commit into from
Aug 9, 2026
+19 −21
Merged

Fix panic in code.replace() with non-interned strings #8471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions Lib/test/test_modulefinder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,6 @@ def test_bytecode(self):
os.remove(source_path)
self._do_test(bytecode_test)

# TODO: RUSTPYTHON; panics at code.rs with 'called Option::unwrap() on a None value'
@unittest.skip("TODO: RUSTPYTHON; panics in co_filename replacement")
def test_replace_paths(self):
old_path = os.path.join(self.test_dir, 'a', 'module.py')
new_path = os.path.join(self.test_dir, 'a', 'spam.py')
Expand Down
38 changes: 19 additions & 19 deletions crates/vm/src/builtins/code.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1366,19 +1366,25 @@ impl PyCode {
OptionalArg::Missing => self.code.instructions.clone(),
};

let intern_all = |objs: Vec<PyObjectRef>, field: &str| -> PyResult<Box<[_]>> {
objs.into_iter()
.map(|o| {
let s = o.downcast_ref::<super::pystr::PyStr>().ok_or_else(|| {
vm.new_type_error(format!("{field} must be a tuple of strings"))
})?;
Ok(vm.ctx.intern_str(s.as_wtf8()))
})
.collect::<PyResult<Vec<_>>>()
.map(Vec::into_boxed_slice)
};

let cellvars = match co_cellvars {
OptionalArg::Present(cellvars) => cellvars
.into_iter()
.map(|o| o.as_interned_str(vm).unwrap())
.collect(),
OptionalArg::Present(cellvars) => intern_all(cellvars, "co_cellvars")?,
OptionalArg::Missing => self.code.cellvars.clone(),
};

let freevars = match co_freevars {
OptionalArg::Present(freevars) => freevars
.into_iter()
.map(|o| o.as_interned_str(vm).unwrap())
.collect(),
OptionalArg::Present(freevars) => intern_all(freevars, "co_freevars")?,
OptionalArg::Missing => self.code.freevars.clone(),
};

Expand Down Expand Up @@ -1411,25 +1417,19 @@ impl PyCode {
posonlyarg_count,
arg_count,
kwonlyarg_count,
source_path: source_path.as_object().as_interned_str(vm).unwrap(),
source_path: vm.ctx.intern_str(source_path.as_wtf8()),
first_line_number,
obj_name: obj_name.as_object().as_interned_str(vm).unwrap(),
qualname: qualname.as_object().as_interned_str(vm).unwrap(),
obj_name: vm.ctx.intern_str(obj_name.as_wtf8()),
qualname: vm.ctx.intern_str(qualname.as_wtf8()),

max_stackdepth,
instructions,
// FIXME: invalid locations. Actually locations is a duplication of linetable.
// It can be removed once we move every other code to use linetable only.
locations: self.code.locations.clone(),
constants: constants.into_iter().map(Literal).collect(),
names: names
.into_iter()
.map(|o| o.as_interned_str(vm).unwrap())
.collect(),
varnames: varnames
.into_iter()
.map(|o| o.as_interned_str(vm).unwrap())
.collect(),
names: intern_all(names, "co_names")?,
varnames: intern_all(varnames, "co_varnames")?,
cellvars,
freevars,
localspluskinds: self.code.localspluskinds.clone(),
Expand Down
Loading