[Truffle] Partially fixed Module#const_get with an autoloaded module.

jruby · Jan 5, 2016 · ba286b5 · ba286b5 · nirvdrum · Jan 5, 2016
1 parent 258188f
commit ba286b5
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
@@ -881,6 +881,7 @@ public boolean isConstDefined(DynamicObject module, String fullName, boolean inh
     public abstract static class ConstGetNode extends CoreMethodNode {
 
         @Child private ReadConstantNode readConstantNode;
+        @Child private KernelNodes.RequireNode requireNode;
 
         public ConstGetNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
@@ -927,12 +928,17 @@ public Object getConstantScoped(DynamicObject module, DynamicObject fullName, bo
 
         @TruffleBoundary
         private Object getConstantNoInherit(DynamicObject module, String name, Node currentNode) {
-            final RubyConstant constant = ModuleOperations.lookupConstantWithInherit(getContext(), module, name, false, currentNode);
+            RubyConstant constant = ModuleOperations.lookupConstantWithInherit(getContext(), module, name, false, currentNode);
 
             if (constant == null) {
                 CompilerDirectives.transferToInterpreter();
                 throw new RaiseException(getContext().getCoreLibrary().nameErrorUninitializedConstant(module, name, this));
             } else {
+                if (constant.isAutoload()) {
+                    loadAutoloadedConstant(module, name, constant);
+                    constant = ModuleOperations.lookupConstantWithInherit(getContext(), module, name, false, currentNode);
+                }
+
                 return constant.getValue();
             }
         }
@@ -955,6 +961,15 @@ boolean isScoped(DynamicObject name) {
             return name.toString().contains("::");
         }
 
+        private void loadAutoloadedConstant(DynamicObject module, String name, RubyConstant constant) {
+            if (requireNode == null) {
+                CompilerDirectives.transferToInterpreter();
+                requireNode = insert(KernelNodesFactory.RequireNodeFactory.create(getContext(), getSourceSection(), null));
+            }
+
+            requireNode.require((DynamicObject) constant.getValue());
+        }
+
     }
 
     @CoreMethod(names = "const_missing", required = 1)