Module#kind_of? and #<= should look for origin.

jruby · Feb 22, 2019 · 2bf2413 · 2bf2413
1 parent 081230d
commit 2bf2413
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/core/src/main/java/org/jruby/IncludedModule.java b/core/src/main/java/org/jruby/IncludedModule.java
@@ -63,6 +63,11 @@ protected Map<String, IRubyObject> getClassVariablesForRead() {
         return origin.getClassVariablesForRead();
     }
 
+    @Override
+    protected boolean isSame(RubyModule module) {
+        return origin.isSame(module.getDelegate());
+    }
+
     /** The module to which this include origins. */
     protected final RubyModule origin;
 }
diff --git a/core/src/main/java/org/jruby/IncludedModuleWrapper.java b/core/src/main/java/org/jruby/IncludedModuleWrapper.java
@@ -100,11 +100,6 @@ public boolean isPrepended() {
         return origin.hasPrepends();
     }
 
-    @Override
-    protected boolean isSame(RubyModule module) {
-        return origin.isSame(module.getDelegate());
-    }
-
     @Override
     public Map<String, DynamicMethod> getMethods() {
         return origin.getMethods();

diff --git a/core/src/main/java/org/jruby/RubyModule.java b/core/src/main/java/org/jruby/RubyModule.java
@@ -264,7 +264,7 @@ public boolean isSingleton() {
     public static class KindOf {
         public static final KindOf DEFAULT_KIND_OF = new KindOf();
         public boolean isKindOf(IRubyObject obj, RubyModule type) {
-            return obj.getMetaClass().hasModuleInHierarchy(type);
+            return obj.getMetaClass().hasModuleInHierarchy(type.getMethodLocation());
         }
     }