Include wrappers and meta classes should use super's class index.

Fixes #4340.
jruby · Nov 29, 2016 · 2661806 · 2661806
1 parent e56920c
commit 2661806
Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/IncludedModule.java b/core/src/main/java/org/jruby/IncludedModule.java
@@ -9,6 +9,9 @@ public IncludedModule(Ruby runtime, RubyClass superClass, RubyModule origin) {
         super(runtime, superClass, false);
         this.origin = origin;
         this.metaClass = origin.metaClass;
+        if (superClass != null) {
+            setClassIndex(superClass.getClassIndex()); // use same ClassIndex as metaclass, since we're technically still of that type
+        }
     }
 
     @Override

diff --git a/core/src/main/java/org/jruby/MetaClass.java b/core/src/main/java/org/jruby/MetaClass.java
@@ -38,7 +38,7 @@ public final class MetaClass extends RubyClass {
     public MetaClass(Ruby runtime, RubyClass superClass, IRubyObject attached) {
         super(runtime, superClass, false);
         this.attached = attached;
-        setClassIndex(superClass.classIndex); // use same ClassIndex as metaclass, since we're technically still of that type
+        setClassIndex(superClass.getClassIndex()); // use same ClassIndex as metaclass, since we're technically still of that type
     }
 
     @Override