mschoi/RustPython
1
0
Fork 0
forked from Rust-related/RustPython
Code Pull Requests Actions Activity

Merge pull request #3293 from DimitrisJim/recursive_inst_subcls

Browse Source 
Fix recursions in isinstance and issubclass.
This commit is contained in:
Jeong YunWon
2021-10-14 16:16:13 +09:00
committed by GitHub
parent b3220f961e 4fad83e3cc
commit f44c61efe5
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/test_isinstance.py vendored
View File

@@ -241,15 +241,11 @@ class TestIsInstanceIsSubclass(unittest.TestCase):
self.assertEqual(True, issubclass(int, (int, (float, int))))
self.assertEqual(True, issubclass(str, (str, (Child, str))))
# TODO: RUSTPYTHON requires issue 2680 for stack depth detection in Rust
@unittest.expectedFailure
def test_subclass_recursion_limit(self):
# make sure that issubclass raises RecursionError before the C stack is
# blown
self.assertRaises(RecursionError, blowstack, issubclass, str, str)
# TODO: RUSTPYTHON requires issue 2680 for stack depth detection in Rust
@unittest.expectedFailure
def test_isinstance_recursion_limit(self):
# make sure that issubclass raises RecursionError before the C stack is
# blown

13
vm/src/vm.rs
View File

@@ -902,7 +902,7 @@ impl VirtualMachine {
}
pub fn to_repr(&self, obj: &PyObjectRef) -> PyResult<PyStrRef> {
self.with_recursion(" while getting the repr of an object", || {
self.with_recursion("while getting the repr of an object", || {
let repr = self.call_special_method(obj.clone(), "__repr__", ())?;
repr.try_into_value(self)
})
@@ -1057,7 +1057,7 @@ impl VirtualMachine {
if let Ok(tuple) = PyTupleRef::try_from_object(self, cls.clone()) {
for typ in tuple.as_slice().iter() {
if self.isinstance(obj, typ)? {
if self.with_recursion("in __instancecheck__", || self.isinstance(obj, typ))? {
return Ok(true);
}
}
@@ -1065,7 +1065,8 @@ impl VirtualMachine {
}
if let Ok(meth) = self.get_special_method(cls.clone(), "__instancecheck__")? {
let ret = meth.invoke((obj.clone(),), self)?;
let ret =
self.with_recursion("in __instancecheck__", || meth.invoke((obj.clone(),), self))?;
return ret.try_to_bool(self);
}
@@ -1139,7 +1140,7 @@ impl VirtualMachine {
if let Ok(tuple) = PyTupleRef::try_from_object(self, cls.clone()) {
for typ in tuple.as_slice().iter() {
if self.issubclass(subclass, typ)? {
if self.with_recursion("in __subclasscheck__", || self.issubclass(subclass, typ))? {
return Ok(true);
}
}
@@ -1147,7 +1148,9 @@ impl VirtualMachine {
}
if let Ok(meth) = self.get_special_method(cls.clone(), "__subclasscheck__")? {
let ret = meth.invoke((subclass.clone(),), self)?;
let ret = self.with_recursion("in __subclasscheck__", || {
meth.invoke((subclass.clone(),), self)
})?;
return ret.try_to_bool(self);
}