[Truffle] Pass LexicalScope explicitly to OpenModuleNode.

* So it does not depend on runtime SharedMethodInfo's LexicalScope.
jruby · Jan 7, 2015 · ea58dc2 · ea58dc2
1 parent 3e4f49c
commit ea58dc2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/truffle/nodes/objects/OpenModuleNode.java b/core/src/main/java/org/jruby/truffle/nodes/objects/OpenModuleNode.java
@@ -28,12 +28,14 @@ public class OpenModuleNode extends RubyNode {
 
     @Child protected RubyNode definingModule;
     @Child protected MethodDefinitionNode definitionMethod;
+    final protected LexicalScope lexicalScope;
     @Child protected IndirectCallNode callModuleDefinitionNode;
 
-    public OpenModuleNode(RubyContext context, SourceSection sourceSection, RubyNode definingModule, MethodDefinitionNode definitionMethod) {
+    public OpenModuleNode(RubyContext context, SourceSection sourceSection, RubyNode definingModule, MethodDefinitionNode definitionMethod, LexicalScope lexicalScope) {
         super(context, sourceSection);
         this.definingModule = definingModule;
         this.definitionMethod = definitionMethod;
+        this.lexicalScope = lexicalScope;
         callModuleDefinitionNode = Truffle.getRuntime().createIndirectCallNode();
     }
 
@@ -44,7 +46,6 @@ public Object execute(VirtualFrame frame) {
         // TODO(CS): cast
         final RubyModule module = (RubyModule) definingModule.execute(frame);
 
-        LexicalScope lexicalScope = definitionMethod.getSharedMethodInfo().getLexicalScope();
         lexicalScope.setLiveModule(module);
         lexicalScope.getParent().getLiveModule().addLexicalDependent(module);
 

diff --git a/core/src/main/java/org/jruby/truffle/translator/BodyTranslator.java b/core/src/main/java/org/jruby/truffle/translator/BodyTranslator.java
@@ -763,7 +763,7 @@ private RubyNode openModule(SourceSection sourceSection, RubyNode defineOrGetNod
 
             final MethodDefinitionNode definitionMethod = classTranslator.compileClassNode(sourceSection, name, bodyNode);
 
-            return new OpenModuleNode(context, sourceSection, defineOrGetNode, definitionMethod);
+            return new OpenModuleNode(context, sourceSection, defineOrGetNode, definitionMethod, newLexicalScope);
         } finally {
             environment.popLexicalScope();
         }