[Truffle] Fix reference to Truffle language.

jruby · Aug 21, 2015 · ece04ea · ece04ea
1 parent 50b46ac
commit ece04ea
Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/LazyRubyRootNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/LazyRubyRootNode.java
@@ -32,8 +32,8 @@ public class LazyRubyRootNode extends RootNode {
     @Child private Node findContextNode;
     @Child private DirectCallNode callNode;
 
-    public LazyRubyRootNode(Class<? extends TruffleLanguage> language, SourceSection sourceSection, FrameDescriptor frameDescriptor, Source source) {
-        super(language, sourceSection, frameDescriptor);
+    public LazyRubyRootNode(SourceSection sourceSection, FrameDescriptor frameDescriptor, Source source) {
+        super(RubyLanguage.class, sourceSection, frameDescriptor);
         this.source = source;
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/RubyRootNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/RubyRootNode.java
@@ -17,6 +17,7 @@
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.SourceSection;
 import org.jruby.truffle.runtime.RubyContext;
+import org.jruby.truffle.runtime.RubyLanguage;
 import org.jruby.truffle.runtime.methods.SharedMethodInfo;
 
 /**
@@ -37,7 +38,7 @@ public RubyRootNode(RubyContext context, SourceSection sourceSection, FrameDescr
     }
 
     public RubyRootNode(RubyContext context, SourceSection sourceSection, FrameDescriptor frameDescriptor, SharedMethodInfo sharedMethodInfo, RubyNode body, boolean needsDeclarationFrame) {
-        super(sourceSection, frameDescriptor);
+        super(RubyLanguage.class, sourceSection, frameDescriptor);
         assert body != null;
         this.context = context;
         this.body = body;

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/RubyLanguage.java b/truffle/src/main/java/org/jruby/truffle/runtime/RubyLanguage.java
@@ -38,7 +38,7 @@ public RubyContext createContext(Env env) {
 
     @Override
     protected CallTarget parse(Source source, Node node, String... strings) throws IOException {
-        return Truffle.getRuntime().createCallTarget(new LazyRubyRootNode(getClass(), null, null, source));
+        return Truffle.getRuntime().createCallTarget(new LazyRubyRootNode(null, null, source));
     }
 
     @Override