Fix bad any cast errors caused by hash collisions

ruby-rice · Oct 7, 2024 · 654f650 · 654f650
1 parent 245ab01
commit 654f650
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/include/rice/rice.hpp b/include/rice/rice.hpp
@@ -1093,10 +1093,10 @@ namespace Rice::detail
     Return_T lookup(VALUE klass, ID method_id);
 
   private:
-    size_t key(VALUE klass, ID method_id);
-    std::unordered_map<size_t, std::any> natives_ = {};
+    std::pair<VALUE, ID> key(VALUE klass, ID method_id);
+    std::map<std::pair<VALUE, ID>, std::any> natives_ = {};
   };
-} 
+}
 
 // ---------   NativeRegistry.ipp   ---------
 
@@ -1112,15 +1112,14 @@ namespace Rice::detail
 {
   // Effective Java (2nd edition)
   // https://stackoverflow.com/a/2634715
-  inline size_t NativeRegistry::key(VALUE klass, ID id)
+  inline std::pair<VALUE, ID> NativeRegistry::key(VALUE klass, ID id)
   {
     if (rb_type(klass) == T_ICLASS)
     {
       klass = detail::protect(rb_class_of, klass);
     }
 
-    uint32_t prime = 53;
-    return (prime + klass) * prime + id;
+    return std::make_pair(klass, id);
   }
 
   inline void NativeRegistry::add(VALUE klass, ID method_id, std::any callable)

diff --git a/rice/detail/NativeRegistry.hpp b/rice/detail/NativeRegistry.hpp
@@ -22,10 +22,10 @@ namespace Rice::detail
     Return_T lookup(VALUE klass, ID method_id);
 
   private:
-    size_t key(VALUE klass, ID method_id);
-    std::unordered_map<size_t, std::any> natives_ = {};
+    std::pair<VALUE, ID> key(VALUE klass, ID method_id);
+    std::map<std::pair<VALUE, ID>, std::any> natives_ = {};
   };
-} 
+}
 #include "NativeRegistry.ipp"
 
-#endif // Rice__detail__NativeRegistry__hpp
+#endif // Rice__detail__NativeRegistry__hpp
diff --git a/rice/detail/NativeRegistry.ipp b/rice/detail/NativeRegistry.ipp
@@ -12,15 +12,14 @@ namespace Rice::detail
 {
   // Effective Java (2nd edition)
   // https://stackoverflow.com/a/2634715
-  inline size_t NativeRegistry::key(VALUE klass, ID id)
+  inline std::pair<VALUE, ID> NativeRegistry::key(VALUE klass, ID id)
   {
     if (rb_type(klass) == T_ICLASS)
     {
       klass = detail::protect(rb_class_of, klass);
     }
 
-    uint32_t prime = 53;
-    return (prime + klass) * prime + id;
+    return std::make_pair(klass, id);
   }
 
   inline void NativeRegistry::add(VALUE klass, ID method_id, std::any callable)