[Truffle] Execute module first in ReadConstantNode.

jruby · Aug 9, 2015 · 57b24b1 · 57b24b1
1 parent 883e8db
commit 57b24b1
Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/constants/ReadConstantNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/constants/ReadConstantNode.java
@@ -34,8 +34,8 @@ public ReadConstantNode(RubyContext context, SourceSection sourceSection, RubyNo
 
     @Override
     public Object execute(VirtualFrame frame) {
-        final String name = (String) nameNode.execute(frame);
         final Object module = moduleNode.execute(frame);
+        final String name = (String) nameNode.execute(frame);
         return readConstant(frame, module, name);
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/constants/ReadLiteralConstantNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/constants/ReadLiteralConstantNode.java
@@ -24,10 +24,10 @@ public class ReadLiteralConstantNode extends RubyNode {
 
     @Child private ReadConstantNode readConstantNode;
 
-    public ReadLiteralConstantNode(RubyContext context, SourceSection sourceSection, RubyNode module, String name) {
+    public ReadLiteralConstantNode(RubyContext context, SourceSection sourceSection, RubyNode moduleNode, String name) {
         super(context, sourceSection);
         RubyNode nameNode = new LiteralNode(context, sourceSection, name);
-        this.readConstantNode = new ReadConstantNode(context, sourceSection, module, nameNode);
+        this.readConstantNode = new ReadConstantNode(context, sourceSection, moduleNode, nameNode);
     }
 
     @Override