Rust-related/RustPython
1
0
Fork 1
mirror of https://github.com/RustPython/RustPython.git synced 2026-06-02 19:39:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix LoadNameAny opecode

Browse Source
This commit is contained in:
yt2b
2022-12-28 22:14:22 +09:00
parent b1db1be031
commit 03eb2dd11b
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
vm/src/frame.rs
View File

@@ -538,11 +538,14 @@ impl ExecutingFrame<'_> {
}
bytecode::Instruction::LoadNameAny(idx) => {
let name = self.code.names[*idx as usize];
let value = self.locals.mapping().subscript(name, vm).ok();
self.push_value(match value {
Some(x) => x,
None => self.load_global_or_builtin(name, vm)?,
});
let result = self.locals.mapping().subscript(name, vm);
match result {
Ok(x) => self.push_value(x),
Err(e) if e.class().is(vm.ctx.exceptions.key_error) => {
self.push_value(self.load_global_or_builtin(name, vm)?);
}
Err(e) => return Err(e),
}
Ok(None)
}
bytecode::Instruction::LoadGlobal(idx) => {