hash_pointer -> hash_object_id

Author: jopemachine

common/src/hash.rs

@@ -179,18 +179,18 @@ pub fn lcg_urandom(mut x: u32, buf: &mut [u8]) {
     }
 }
 
-pub fn hash_pointer_raw(p: *const std::ffi::c_void) -> PyHash {
+pub fn hash_object_id_raw(p: usize) -> PyHash {
     // TODO: Use commented logic when below issue resolved.
     // Ref: https://github.com/RustPython/RustPython/pull/3951#issuecomment-1193108966
 
-    // let mut y = p as usize;
+    // let mut y = p;
     // /* bottom 3 or 4 bits are likely to be 0; rotate y by 4 to avoid
     //    excessive hash collisions for dicts and sets */
     // y = (y >> 4) | (y << (8 * std::mem::size_of::<usize>() - 4));
     // y as PyHash
     p as PyHash
 }
 
-pub fn hash_pointer(p: *const std::ffi::c_void) -> PyHash {
-    fix_sentinel(hash_pointer_raw(p))
+pub fn hash_object_id(p: usize) -> PyHash {
+    fix_sentinel(hash_object_id_raw(p))
 }

vm/src/builtins/complex.rs

@@ -420,11 +420,11 @@ impl Hashable for PyComplex {
     fn hash(zelf: &crate::Py<Self>, _vm: &VirtualMachine) -> PyResult<hash::PyHash> {
         let value = zelf.value;
 
-        let re_hash = hash::hash_float(value.re)
-            .unwrap_or_else(|| hash::hash_pointer(zelf as *const _ as *const std::ffi::c_void));
+        let re_hash =
+            hash::hash_float(value.re).unwrap_or_else(|| hash::hash_object_id(zelf.get_id()));
 
-        let im_hash = hash::hash_float(value.im)
-            .unwrap_or_else(|| hash::hash_pointer(zelf as *const _ as *const std::ffi::c_void));
+        let im_hash =
+            hash::hash_float(value.im).unwrap_or_else(|| hash::hash_object_id(zelf.get_id()));
 
         let Wrapping(ret) = Wrapping(re_hash) + Wrapping(im_hash) * Wrapping(hash::IMAG);
         Ok(hash::fix_sentinel(ret))

vm/src/builtins/float.rs

@@ -539,8 +539,7 @@ impl Comparable for PyFloat {
 impl Hashable for PyFloat {
     #[inline]
     fn hash(zelf: &crate::Py<Self>, _vm: &VirtualMachine) -> PyResult<hash::PyHash> {
-        Ok(hash::hash_float(zelf.to_f64())
-            .unwrap_or_else(|| hash::hash_pointer(zelf as *const _ as *const libc::c_void)))
+        Ok(hash::hash_float(zelf.to_f64()).unwrap_or_else(|| hash::hash_object_id(zelf.get_id())))
     }
 }