Fix usize not using the same hash as PyInt when used as key into a di…

…ctionary
RustPython · youknowone · May 1, 2025 · Apr 29, 2025 · Apr 30, 2025 · Apr 30, 2025
commit aa275bafcc34d73482f5fccde169403d18f83013
diff --git a/common/src/hash.rs b/common/src/hash.rs
@@ -86,6 +86,11 @@ pub fn hash_pointer(value: usize) -> PyHash {
    hash as _
 }

+#[inline]
+pub fn hash_integer<T: num_traits::PrimInt>(data: T) -> PyHash {
+    fix_sentinel(mod_int(data.to_i64().unwrap()))
+}
+
 #[inline]
 pub fn hash_float(value: f64) -> Option<PyHash> {
    // cpython _Py_HashDouble

diff --git a/extra_tests/snippets/builtin_object.py b/extra_tests/snippets/builtin_object.py
@@ -1,6 +1,7 @@
 class MyObject:
    pass

+
 assert not MyObject() == MyObject()
 assert MyObject() != MyObject()
 myobj = MyObject()
@@ -24,3 +25,10 @@ class MyObject:
 assert not hasattr(obj, 'a')
 obj.__dict__ = {'a': 1}
 assert obj.a == 1
+
+# Value inside the formatter goes through a different path of resolution.
+# Check that it still works all the same
+d = {
+    0: "ab",
+}
+assert "ab ab" == "{k[0]} {vv}".format(k=d, vv=d[0])
diff --git a/vm/src/dict_inner.rs b/vm/src/dict_inner.rs
@@ -17,6 +17,7 @@ use crate::{
    object::{Traverse, TraverseFn},
 };
 use num_traits::ToPrimitive;
+use rustpython_common::hash::hash_integer;
 use std::{fmt, mem::size_of, ops::ControlFlow};

 // HashIndex is intended to be same size with hash::PyHash
@@ -993,8 +994,8 @@ impl DictKey for usize {
        *self
    }

-    fn key_hash(&self, vm: &VirtualMachine) -> PyResult<HashValue> {
-        Ok(vm.state.hash_secret.hash_value(self))
+    fn key_hash(&self, _vm: &VirtualMachine) -> PyResult<HashValue> {
+        Ok(hash_integer(*self))
    }

    fn key_is(&self, _other: &PyObject) -> bool {
-Original file line number
+Diff line change
@@ -86,6 +86,11 @@ pub fn hash_pointer(value: usize) -> PyHash {
         hash as _
     }
+    #[inline]
+    pub fn hash_integer<T: num_traits::PrimInt>(data: T) -> PyHash {
             Copy link

  
      
    
  

  
      

  
  Member


      

  

  
    
      

      
            youknowone
  

      

      

      


        Apr 30, 2025


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      To avoid unnecessarily complicated error handlings, pub fn hash_usize(data: usize) will be enough.

Let's place this function beside hash_bigint to find each other easier
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
+        fix_sentinel(mod_int(data.to_i64().unwrap()))
                   hbina marked this conversation as resolved.
              

          
            Show resolved
            Hide resolved
        

                
  
            
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.
+    }
     #[inline]
     pub fn hash_float(value: f64) -> Option<PyHash> {
         // cpython _Py_HashDouble
-          Expand Down