Change signature of isinstance to take a reference to a python reference

Author: windelbouwman

vm/src/builtins.rs

@@ -213,7 +213,7 @@ fn builtin_issubclass(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
         panic!("issubclass expects exactly two parameters");
     }
 
-    let cls1 = args.args[0].clone();
+    let cls1 = &args.args[0];
     let cls2 = args.args[1].clone();
 
     Ok(vm.context().new_bool(objtype::issubclass(cls1, cls2)))

vm/src/macros.rs

@@ -63,7 +63,7 @@ macro_rules! arg_check {
         {
             match expected_type {
                 Some(expected_type) => {
-                    if !objtype::isinstance(arg.clone(), expected_type.clone()) {
+                    if !objtype::isinstance(arg, expected_type.clone()) {
                         let arg_typ = arg.typ().clone();
                         let actual_type = arg_typ.borrow().str().clone();
                         return Err($vm.new_type_error(format!(

vm/src/obj/objint.rs

@@ -14,7 +14,7 @@ fn str(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
 
 fn int_new(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     let ref cls = args.args[0];
-    if !objtype::issubclass(cls.clone(), vm.ctx.int_type()) {
+    if !objtype::issubclass(cls, vm.ctx.int_type()) {
         return Err(vm.new_type_error(format!("{:?} is not a subtype of int", cls)));
     }
     let val = to_int(vm, &args.args[1].clone())?;

vm/src/obj/objtype.rs

@@ -54,13 +54,13 @@ fn _mro(cls: PyObjectRef) -> Option<Vec<PyObjectRef>> {
     }
 }
 
-pub fn isinstance(obj: PyObjectRef, cls: PyObjectRef) -> bool {
+pub fn isinstance(obj: &PyObjectRef, cls: PyObjectRef) -> bool {
     let mro = _mro(obj.typ()).unwrap();
     mro.into_iter().any(|c| c.is(&cls))
 }
 
-pub fn issubclass(typ: PyObjectRef, cls: PyObjectRef) -> bool {
-    let mro = _mro(typ).unwrap();
+pub fn issubclass(typ: &PyObjectRef, cls: PyObjectRef) -> bool {
+    let mro = _mro(typ.clone()).unwrap();
     mro.into_iter().any(|c| c.is(&cls))
 }
 

vm/src/vm.rs

@@ -259,7 +259,7 @@ impl VirtualMachine {
                     // unwind block stack on exception and find any handlers.
                     // Add an entry in the traceback:
                     assert!(objtype::isinstance(
-                        exception.clone(),
+                        &exception,
                         self.ctx.exceptions.base_exception_type.clone()
                     ));
                     let traceback = self
@@ -962,7 +962,7 @@ impl VirtualMachine {
                     _ => panic!("Invalid paramter for RAISE_VARARGS, must be between 0 to 3"),
                 };
                 if objtype::isinstance(
-                    exception.clone(),
+                    &exception,
                     self.context().exceptions.base_exception_type.clone(),
                 ) {
                     info!("Exception raised: {:?}", exception);