[GR-26546] Replace the RubyContext field from RubyContextSourceNode with ContextReference

PullRequest: truffleruby/2057

Author: bjfish

src/main/java/org/truffleruby/core/VMPrimitiveNodes.java

@@ -270,7 +270,7 @@ protected boolean watchSignalProc(RubyString signalString, RubyProc action) {
 
                 final RubyThread rootThread = context.getThreadManager().getRootThread();
                 final FiberManager fiberManager = rootThread.fiberManager;
-                final ThreadManager threadManager = getContext().getThreadManager();
+                final ThreadManager threadManager = context.getThreadManager();
 
                 // Workaround: we need to register with Truffle (which means going multithreaded),
                 // so that NFI can get its context to call pthread_kill() (GR-7405).

src/main/java/org/truffleruby/core/cast/TaintResultNode.java

@@ -37,15 +37,14 @@ public TaintResultNode(boolean taintFromSelf, int taintFromParameter, RubyNode m
         this.taintFromSelf = taintFromSelf;
         this.taintFromParameter = taintFromParameter;
         this.method = method;
-        this.rubyLibrarySource = RubyLibrary.getFactory().createDispatched(getRubyLibraryCacheLimit());
     }
 
     public TaintResultNode() {
         this(false, -1, null);
     }
 
     public Object maybeTaint(Object source, Object result) {
-        if (taintProfile.profile(rubyLibrarySource.isTainted(source))) {
+        if (taintProfile.profile(isTainted(source))) {
             if (rubyLibraryResult == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 rubyLibraryResult = insert(RubyLibrary.getFactory().createDispatched(getRubyLibraryCacheLimit()));
@@ -56,6 +55,14 @@ public Object maybeTaint(Object source, Object result) {
         return result;
     }
 
+    private boolean isTainted(Object result) {
+        if (rubyLibrarySource == null) {
+            CompilerDirectives.transferToInterpreterAndInvalidate();
+            rubyLibrarySource = insert(RubyLibrary.getFactory().createDispatched(getRubyLibraryCacheLimit()));
+        }
+        return rubyLibrarySource.isTainted(result);
+    }
+
     @Override
     public Object execute(VirtualFrame frame) {
         final Object result;

src/main/java/org/truffleruby/language/RubyContextSourceNode.java

@@ -9,6 +9,7 @@
  */
 package org.truffleruby.language;
 
+import com.oracle.truffle.api.TruffleLanguage.ContextReference;
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
 
@@ -60,15 +61,15 @@ protected void setSourceLength(int sourceLength) {
 
     // Context
 
-    @CompilationFinal private RubyContext context;
+    @CompilationFinal private ContextReference<RubyContext> contextReference;
 
     @Override
     public RubyContext getContext() {
-        if (context == null) {
+        if (contextReference == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            context = RubyLanguage.getCurrentContext();
+            contextReference = lookupContextReference(RubyLanguage.class);
         }
 
-        return context;
+        return contextReference.get();
     }
 }