Merge pull request #6785 from enebo/fix_6271

enebo · web-flow · commit b8987dce05e7 · 2021-08-25T12:32:58.000-05:00
Fixes #6271. Prepending a module hides module's constants
diff --git a/core/src/main/java/org/jruby/AbstractRubyMethod.java b/core/src/main/java/org/jruby/AbstractRubyMethod.java
@@ -104,7 +104,7 @@ public String getMethodName() {
 
     @JRubyMethod(name = "owner")
     public IRubyObject owner(ThreadContext context) {
-        return implementationModule;
+        return implementationModule.getOrigin();
     }
 
     @JRubyMethod(name = "source_location")
diff --git a/core/src/main/java/org/jruby/IncludedModuleWrapper.java b/core/src/main/java/org/jruby/IncludedModuleWrapper.java
@@ -131,21 +131,6 @@ protected void variableTableSync(List<Variable<Object>> vars) {
     // CONSTANT TABLE METHODS - pass to origin
     //
 
-    @Override
-    protected boolean constantTableContains(String name) {
-        return origin.constantTableContains(name);
-    }
-
-    @Override
-    protected IRubyObject constantTableFetch(String name) {
-        return origin.constantTableFetch(name);
-    }
-
-    @Override
-    protected ConstantEntry constantEntryFetch(String name) {
-        return origin.constantEntryFetch(name);
-    }
-
     @Override
     protected IRubyObject constantTableStore(String name, IRubyObject value) {
         // FIXME: legal here? may want UnsupportedOperationException
@@ -163,22 +148,6 @@ protected IRubyObject constantTableRemove(String name) {
         return origin.constantTableRemove(name);
     }
 
-    @Override
-    @Deprecated
-    public List<String> getStoredConstantNameList() {
-        return origin.getStoredConstantNameList();
-    }
-
-    @Override
-    public Collection<String> getConstantNames() {
-        return origin.getConstantNames();
-    }
-
-    @Override
-    public Collection<String> getConstantNames(boolean includePrivate) {
-        return origin.getConstantNames(includePrivate);
-    }
-
     @Override
     protected IRubyObject getAutoloadConstant(String name, boolean forceLoad) {
         return origin.getAutoloadConstant(name, forceLoad);
diff --git a/core/src/main/java/org/jruby/PrependedModule.java b/core/src/main/java/org/jruby/PrependedModule.java
@@ -29,7 +29,9 @@
 
 package org.jruby;
 
+import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 
 import org.jruby.internal.runtime.methods.DynamicMethod;
@@ -158,4 +160,40 @@ protected Map<String, IRubyObject> getClassVariablesForRead() {
         return origin.getClassVariablesForRead();
     }
 
+    //
+    // CONSTANT TABLE METHODS - pass to origin
+    //
+
+    @Override
+    protected IRubyObject constantTableStore(String name, IRubyObject value) {
+        // FIXME: legal here? may want UnsupportedOperationException
+        return origin.constantTableStore(name, value);
+    }
+
+    protected IRubyObject constantTableStore(String name, IRubyObject value, boolean hidden) {
+        // FIXME: legal here? may want UnsupportedOperationException
+        return origin.constantTableStore(name, value, hidden);
+    }
+
+    @Override
+    protected IRubyObject constantTableRemove(String name) {
+        // this _is_ legal (when removing an undef)
+        return origin.constantTableRemove(name);
+    }
+
+    @Override
+    protected IRubyObject getAutoloadConstant(String name, boolean forceLoad) {
+        return origin.getAutoloadConstant(name, forceLoad);
+    }
+
+    @Override
+    protected Map<String, Autoload> getAutoloadMap() {
+        return origin.getAutoloadMap();
+    }
+
+    @Override
+    protected Map<String, Autoload> getAutoloadMapForWrite() {
+        return origin.getAutoloadMapForWrite();
+    }
+
 }
diff --git a/core/src/main/java/org/jruby/RubyModule.java b/core/src/main/java/org/jruby/RubyModule.java
@@ -306,7 +306,7 @@ public boolean isInstance(IRubyObject object) {
     }
 
     public Map<String, ConstantEntry> getConstantMap() {
-        return constants;
+        return getOrigin().constants;
     }
 
     public Map<String, ConstantEntry> getConstantMapForWrite() {
@@ -3579,8 +3579,8 @@ private void doPrependModule(RubyModule baseModule) {
      * @return A list of all modules that would be included by including the given module
      */
     private List<RubyModule> gatherModules(RubyModule baseModule) {
-        // build a list of all modules to consider for inclusion
-        List<RubyModule> modulesToInclude = new ArrayList<RubyModule>();
+        List<RubyModule> modulesToInclude = new ArrayList<>();
+
         for (; baseModule != null; baseModule = baseModule.superClass) {
             // skip prepended roots
             if (baseModule != baseModule.getMethodLocation()) continue;
@@ -4967,7 +4967,7 @@ public List<Variable<IRubyObject>> getStoredConstantList() {
 
     @Deprecated
     public List<String> getStoredConstantNameList() {
-        return new ArrayList<String>(getConstantMap().keySet());
+        return new ArrayList<>(getConstantMap().keySet());
     }
 
     /**
@@ -4984,7 +4984,7 @@ public Collection<String> getConstantNames(boolean includePrivate) {
             return Collections.EMPTY_SET;
         }
 
-        HashSet<String> publicNames = new HashSet<String>(getConstantMap().size());
+        HashSet<String> publicNames = new HashSet<>(getConstantMap().size());
 
         for (Map.Entry<String, ConstantEntry> entry : getConstantMap().entrySet()) {
             if (entry.getValue().hidden) continue;
diff --git a/spec/tags/ruby/core/module/prepend_tags.txt b/spec/tags/ruby/core/module/prepend_tags.txt

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public String getMethodName() {`
`104`	`104`
`105`	`105`	`@JRubyMethod(name = "owner")`
`106`	`106`	`public IRubyObject owner(ThreadContext context) {`
`107`		`- return implementationModule;`
	`107`	`+ return implementationModule.getOrigin();`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`@JRubyMethod(name = "source_location")`