Merge pull request #1505 from youknowone/defer-new-int-clone

coolreader18 · web-flow · commit d42d422566f6 · 2019-10-13T14:27:37.000-05:00
Defer BigInt::clone() for new_int
diff --git a/vm/src/obj/objenumerate.rs b/vm/src/obj/objenumerate.rs
@@ -54,7 +54,7 @@ impl PyEnumerate {
         let next_obj = objiter::call_next(vm, iterator)?;
         let result = vm
             .ctx
-            .new_tuple(vec![vm.ctx.new_int(counter.borrow().clone()), next_obj]);
+            .new_tuple(vec![vm.ctx.new_bigint(&counter.borrow()), next_obj]);
 
         AddAssign::add_assign(&mut counter.borrow_mut() as &mut BigInt, 1);
 
diff --git a/vm/src/obj/objfloat.rs b/vm/src/obj/objfloat.rs
@@ -559,8 +559,8 @@ impl PyFloat {
         }
 
         let ratio = Ratio::from_float(value).unwrap();
-        let numer = vm.ctx.new_int(ratio.numer().clone());
-        let denom = vm.ctx.new_int(ratio.denom().clone());
+        let numer = vm.ctx.new_bigint(ratio.numer());
+        let denom = vm.ctx.new_bigint(ratio.denom());
         Ok(vm.ctx.new_tuple(vec![numer, denom]))
     }
 
diff --git a/vm/src/obj/objint.rs b/vm/src/obj/objint.rs
@@ -124,8 +124,10 @@ fn inner_pow(int1: &PyInt, int2: &PyInt, vm: &VirtualMachine) -> PyResult {
     } else {
         Ok(if let Some(v2) = int2.value.to_u64() {
             vm.ctx.new_int(int1.value.pow(v2))
-        } else if int1.value.is_one() || int1.value.is_zero() {
-            vm.ctx.new_int(int1.value.clone())
+        } else if int1.value.is_one() {
+            vm.ctx.new_int(1)
+        } else if int1.value.is_zero() {
+            vm.ctx.new_int(0)
         } else if int1.value == BigInt::from(-1) {
             if int2.value.is_odd() {
                 vm.ctx.new_int(-1)
@@ -672,7 +674,7 @@ impl PyInt {
     }
     #[pyproperty]
     fn real(&self, vm: &VirtualMachine) -> PyObjectRef {
-        vm.ctx.new_int(self.value.clone())
+        vm.ctx.new_bigint(&self.value)
     }
 
     #[pyproperty]
diff --git a/vm/src/pyobject.rs b/vm/src/pyobject.rs
@@ -384,6 +384,17 @@ impl PyContext {
         PyObject::new(PyInt::new(i), self.int_type(), None)
     }
 
+    #[inline]
+    pub fn new_bigint(&self, i: &BigInt) -> PyObjectRef {
+        if let Some(i) = i.to_i32() {
+            if i >= INT_CACHE_POOL_MIN && i <= INT_CACHE_POOL_MAX {
+                let inner_idx = (i - INT_CACHE_POOL_MIN) as usize;
+                return self.int_cache_pool[inner_idx].clone();
+            }
+        }
+        PyObject::new(PyInt::new(i.clone()), self.int_type(), None)
+    }
+
     pub fn new_float(&self, value: f64) -> PyObjectRef {
         PyObject::new(PyFloat::from(value), self.float_type(), None)
     }
@@ -520,7 +531,7 @@ impl PyContext {
 
     pub fn unwrap_constant(&self, value: &bytecode::Constant) -> PyObjectRef {
         match *value {
-            bytecode::Constant::Integer { ref value } => self.new_int(value.clone()),
+            bytecode::Constant::Integer { ref value } => self.new_bigint(value),
             bytecode::Constant::Float { ref value } => self.new_float(*value),
             bytecode::Constant::Complex { ref value } => self.new_complex(*value),
             bytecode::Constant::String { ref value } => self.new_str(value.clone()),

Original file line number	Diff line number	Diff line change
`@@ -559,8 +559,8 @@ impl PyFloat {`
`559`	`559`	`}`
`560`	`560`
`561`	`561`	`let ratio = Ratio::from_float(value).unwrap();`
`562`		`- let numer = vm.ctx.new_int(ratio.numer().clone());`
`563`		`- let denom = vm.ctx.new_int(ratio.denom().clone());`
	`562`	`+ let numer = vm.ctx.new_bigint(ratio.numer());`
	`563`	`+ let denom = vm.ctx.new_bigint(ratio.denom());`
`564`	`564`	`Ok(vm.ctx.new_tuple(vec![numer, denom]))`
`565`	`565`	`}`
`566`	`566`