Dispatch to Module#hash if not built-in

headius · headius · commit 6e0f8bd52d7a · 2025-05-29T15:04:40.000-05:00
Fixes one failure in Zeitwerk that expected Module#hash to be
called when a module was a key in a Hash.
diff --git a/core/src/main/java/org/jruby/RubyModule.java b/core/src/main/java/org/jruby/RubyModule.java
@@ -107,6 +107,7 @@
 import org.jruby.runtime.Constants;
 import org.jruby.runtime.Helpers;
 import org.jruby.runtime.IRBlockBody;
+import org.jruby.runtime.JavaSites;
 import org.jruby.runtime.MethodFactory;
 import org.jruby.runtime.MethodIndex;
 import org.jruby.runtime.ObjectAllocator;
@@ -118,6 +119,7 @@
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.runtime.builtin.Variable;
 import org.jruby.runtime.callsite.CacheEntry;
+import org.jruby.runtime.callsite.CachingCallSite;
 import org.jruby.runtime.load.LoadService;
 import org.jruby.runtime.marshal.MarshalDumper;
 import org.jruby.runtime.marshal.MarshalLoader;
@@ -3199,7 +3201,22 @@ public boolean hasModuleInHierarchy(RubyModule type) {
 
     @Override
     public int hashCode() {
-        return id;
+        RubyClass metaClass = this.metaClass;
+
+        // may be null during boot
+        if (metaClass == null) return id;
+
+        Ruby runtime = metaClass.getClassRuntime();
+
+        if (runtime.isBooting()) return id;
+
+        ThreadContext context = runtime.getCurrentContext();
+        CachingCallSite hash = sites(context).hash;
+
+        if (hash.isBuiltin(this)) return id;
+
+        // we truncate for Java hashcode
+        return (int) hash.call(context, this, this).convertToInteger().getLongValue();
     }
 
     @JRubyMethod(name = "hash")
@@ -6985,6 +7002,10 @@ private class RefinementStore {
             .from(boolean.class, ThreadContext.class, IRubyObject.class, int.class)
             .invokeStaticQuiet(LOOKUP, RubyModule.class, "testModuleMatch");
 
+    public static JavaSites.ModuleSites sites(ThreadContext context) {
+        return context.sites.Module;
+    }
+
     @Deprecated
     public IRubyObject const_get(IRubyObject symbol) {
         return const_get(getCurrentContext(), symbol);
diff --git a/core/src/main/java/org/jruby/runtime/JavaSites.java b/core/src/main/java/org/jruby/runtime/JavaSites.java
@@ -57,6 +57,7 @@ public class JavaSites {
     public final MethodSites Method = new MethodSites();
     public final SymbolSites Symbol = new SymbolSites();
     public final ProcSites Proc = new ProcSites();
+    public final ModuleSites Module = new ModuleSites();
 
     public static class BasicObjectSites {
         public final CallSite respond_to = new FunctionalCachingCallSite("respond_to?");
@@ -566,6 +567,10 @@ public static class ProcSites {
         public final CallSite initialize_dup = new FunctionalCachingCallSite("initialize_dup");
     }
 
+    public static class ModuleSites {
+        public final CachingCallSite hash = new FunctionalCachingCallSite("hash");
+    }
+
     public static class CheckedSites {
         public final RespondToCallSite respond_to_X;
         public final CachingCallSite respond_to_missing = new FunctionalCachingCallSite("respond_to_missing?");
