[Truffle] Use the proper technique to find the correct Ruby context.

jruby · Oct 31, 2016 · 407dd85 · eregon · Nov 1, 2016 · chrisseaton
1 parent 4d35ae3
commit 407dd85
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/RubyContext.java b/truffle/src/main/java/org/jruby/truffle/RubyContext.java
@@ -317,8 +317,8 @@ public CoverageManager getCoverageManager() {
         return coverageManager;
     }
 
-    public static RubyContext getLatestInstance() {
-        return latestInstance;
+    public static RubyContext getInstance() {
+        return RubyLanguage.INSTANCE.unprotectedFindContext(RubyLanguage.INSTANCE.unprotectedCreateFindContextNode());
     }
 
     public AttachmentsManager getAttachmentsManager() {

diff --git a/truffle/src/main/java/org/jruby/truffle/debug/DebugHelpers.java b/truffle/src/main/java/org/jruby/truffle/debug/DebugHelpers.java
@@ -29,7 +29,7 @@ public abstract class DebugHelpers {
 
     @Deprecated
     public static Object eval(String code, Object... arguments) {
-        return eval(RubyContext.getLatestInstance(), code, arguments);
+        return eval(RubyContext.getInstance(), code, arguments);
     }
 
     @Deprecated

diff --git a/truffle/src/main/java/org/jruby/truffle/language/LazyRubyRootNode.java b/truffle/src/main/java/org/jruby/truffle/language/LazyRubyRootNode.java
@@ -42,20 +42,18 @@ public class LazyRubyRootNode extends RootNode implements InternalRootNode {
     @CompilationFinal private DynamicObject mainObject;
     @CompilationFinal private InternalMethod method;
 
-    @Child private Node findContextNode;
     @Child private DirectCallNode callNode;
 
     public LazyRubyRootNode(SourceSection sourceSection, FrameDescriptor frameDescriptor, Source source,
                             String[] argumentNames) {
         super(RubyLanguage.class, sourceSection, frameDescriptor);
         this.source = source;
         this.argumentNames = argumentNames;
-        this.findContextNode = RubyLanguage.INSTANCE.unprotectedCreateFindContextNode();
     }
 
     @Override
     public Object execute(VirtualFrame frame) {
-        final RubyContext context = RubyLanguage.INSTANCE.unprotectedFindContext(findContextNode);
+        final RubyContext context = RubyContext.getInstance();
 
         if (cachedContext == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();

diff --git a/truffle/src/main/java/org/jruby/truffle/language/RubyBaseNode.java b/truffle/src/main/java/org/jruby/truffle/language/RubyBaseNode.java
@@ -177,10 +177,7 @@ public RubyContext getContext() {
 
             while (true) {
                 if (parent == null) {
-                    System.err.println("warning: using global context!");
-                    context = RubyContext.getLatestInstance();
-                    break;
-                    //throw new UnsupportedOperationException("can't get the RubyContext because the parent is null");
+                    context = RubyContext.getInstance();
                 }
 
                 if (parent instanceof RubyBaseNode) {