Remove usages of lookupContextReference()

Author: eregon

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

@@ -13,6 +13,8 @@
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.SourceSection;
+import org.truffleruby.RubyContext;
+import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.CoreLibrary;
 
 public abstract class RubyBaseRootNode extends RootNode {
@@ -48,4 +50,12 @@ public boolean countsTowardsStackTraceLimit() {
         // Entries with a java source section should not count towards the limit, even though they're not internal.
         return !isInternal() && sourceSection != CoreLibrary.JAVA_CORE_SOURCE_SECTION;
     }
+
+    public final RubyLanguage getLanguage() {
+        return RubyLanguage.get(this);
+    }
+
+    public final RubyContext getContext() {
+        return RubyContext.get(this);
+    }
 }

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

@@ -10,7 +10,6 @@
 package org.truffleruby.language;
 
 import com.oracle.truffle.api.CompilerAsserts;
-import com.oracle.truffle.api.TruffleLanguage.ContextReference;
 import com.oracle.truffle.api.nodes.Node;
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
@@ -56,28 +55,24 @@ protected void checkArity(VirtualFrame frame) {
                     arityForCheck,
                     RubyArguments.getArgumentsCount(frame),
                     checkArityProfile,
-                    getContextReference(),
                     this);
         } else {
-            checkKeywordArityNode.checkArity(frame, arityForCheck, checkArityProfile, language, getContextReference());
+            checkKeywordArityNode.checkArity(frame, arityForCheck, checkArityProfile);
         }
     }
 
     public static void checkArity(Arity arity, int given,
             BranchProfile checkFailedProfile,
-            ContextReference<RubyContext> contextRef,
             Node currentNode) {
         CompilerAsserts.partialEvaluationConstant(arity);
         if (!arity.check(given)) {
             checkFailedProfile.enter();
-            checkArityError(arity, given, contextRef, currentNode);
+            checkArityError(arity, given, currentNode);
         }
     }
 
-    private static void checkArityError(Arity arity, int given,
-            ContextReference<RubyContext> contextRef,
-            Node currentNode) {
-        final RubyContext context = contextRef.get();
+    private static void checkArityError(Arity arity, int given, Node currentNode) {
+        final RubyContext context = RubyContext.get(currentNode);
         if (arity.hasRest()) {
             throw new RaiseException(
                     context,

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

@@ -9,7 +9,6 @@
  */
 package org.truffleruby.language;
 
-import com.oracle.truffle.api.TruffleLanguage.ContextReference;
 import org.jcodings.specific.UTF8Encoding;
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
@@ -19,16 +18,13 @@
 import org.truffleruby.core.string.StringOperations;
 import org.truffleruby.language.backtrace.InternalRootNode;
 
-import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.source.Source;
 
 public class RubyEvalInteractiveRootNode extends RubyBaseRootNode implements InternalRootNode {
 
     private final Rope sourceRope;
 
-    @CompilationFinal private ContextReference<RubyContext> contextReference;
     private final RubyLanguage language;
 
     public RubyEvalInteractiveRootNode(RubyLanguage language, Source source) {
@@ -39,11 +35,7 @@ public RubyEvalInteractiveRootNode(RubyLanguage language, Source source) {
 
     @Override
     public Object execute(VirtualFrame frame) {
-        if (contextReference == null) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            contextReference = lookupContextReference(RubyLanguage.class);
-        }
-        final RubyContext context = contextReference.get();
+        final RubyContext context = getContext();
 
         // Just do Truffle::Boot::INTERACTIVE_BINDING.eval(code) for interactive sources.
         // It's the semantics we want and takes care of caching correctly based on the Binding's FrameDescriptor.

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

@@ -66,7 +66,7 @@ public RubyLambdaRootNode(
 
     public RubyLambdaRootNode copyRootNode(SharedMethodInfo newSharedMethodInfo, RubyNode newBody) {
         return new RubyLambdaRootNode(
-                language,
+                getLanguage(),
                 getSourceSection(),
                 getFrameDescriptor(),
                 newSharedMethodInfo,

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

@@ -9,7 +9,6 @@
  */
 package org.truffleruby.language;
 
-import com.oracle.truffle.api.TruffleLanguage.ContextReference;
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.language.arguments.RubyArguments;
@@ -32,14 +31,12 @@
 
 public class RubyParsingRequestNode extends RubyBaseRootNode implements InternalRootNode {
 
-    private final ContextReference<RubyContext> contextReference;
     private final RootCallTarget callTarget;
 
     @Child private DirectCallNode callNode;
 
     public RubyParsingRequestNode(RubyLanguage language, RubyContext context, Source source, String[] argumentNames) {
         super(language, null, null);
-        this.contextReference = lookupContextReference(RubyLanguage.class);
 
         final RubySource rubySource = new RubySource(source, language.getSourcePath(source));
 
@@ -59,8 +56,8 @@ public RubyParsingRequestNode(RubyLanguage language, RubyContext context, Source
 
     @Override
     public Object execute(VirtualFrame frame) {
-        final RubyLanguage language = getLanguage(RubyLanguage.class);
-        final RubyContext context = contextReference.get();
+        final RubyLanguage language = getLanguage();
+        final RubyContext context = getContext();
 
         final SharedMethodInfo sharedMethodInfo = RubyRootNode.of(callTarget).getSharedMethodInfo();
         assert sharedMethodInfo.getStaticLexicalScopeOrNull() == context.getRootLexicalScope() ||

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

@@ -9,13 +9,9 @@
  */
 package org.truffleruby.language;
 
-import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.TruffleLanguage.ContextReference;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.nodes.NodeUtil;
-import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.builtins.ReRaiseInlinedExceptionNode;
 import org.truffleruby.language.control.ReturnID;
@@ -32,9 +28,6 @@ public static RubyRootNode of(RootCallTarget callTarget) {
         return (RubyRootNode) callTarget.getRootNode();
     }
 
-    protected final RubyLanguage language;
-    @CompilationFinal private ContextReference<RubyContext> contextReference;
-
     private final SharedMethodInfo sharedMethodInfo;
     private Split split;
     public final ReturnID returnID;
@@ -53,7 +46,6 @@ public RubyRootNode(
         assert sourceSection != null;
         assert body != null;
 
-        this.language = language;
         this.sharedMethodInfo = sharedMethodInfo;
         this.body = body;
         this.split = split;
@@ -112,17 +104,4 @@ public RubyNode copyBody() {
         return NodeUtil.cloneNode(body);
     }
 
-    public final ContextReference<RubyContext> getContextReference() {
-        if (contextReference == null) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            contextReference = lookupContextReference(RubyLanguage.class);
-        }
-
-        return contextReference;
-    }
-
-    public final RubyContext getContext() {
-        return getContextReference().get();
-    }
-
 }

src/main/java/org/truffleruby/language/arguments/CheckKeywordArityNode.java

@@ -11,8 +11,6 @@
 
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.TruffleLanguage.ContextReference;
-import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.hash.RubyHash;
 import org.truffleruby.core.hash.library.HashStoreLibrary;
@@ -42,9 +40,7 @@ public CheckKeywordArityNode(Arity arity) {
     }
 
     public void checkArity(VirtualFrame frame, Arity arity,
-            BranchProfile basicArityCheckFailedProfile,
-            RubyLanguage language,
-            ContextReference<RubyContext> contextRef) {
+            BranchProfile basicArityCheckFailedProfile) {
         CompilerAsserts.partialEvaluationConstant(arity);
 
         final RubyHash keywordArguments = readUserKeywordsHashNode.execute(frame);
@@ -59,13 +55,11 @@ public void checkArity(VirtualFrame frame, Arity arity,
 
         if (!arity.basicCheck(given)) {
             basicArityCheckFailedProfile.enter();
-            throw new RaiseException(
-                    contextRef.get(),
-                    contextRef.get().getCoreExceptions().argumentError(given, arity.getRequired(), this));
+            throw new RaiseException(getContext(), coreExceptions().argumentError(given, arity.getRequired(), this));
         }
 
         if (!arity.hasKeywordsRest() && keywordArguments != null) {
-            checkKeywordArguments(argumentsCount, keywordArguments, arity, language);
+            checkKeywordArguments(argumentsCount, keywordArguments, arity, getLanguage());
         }
     }
 

src/main/java/org/truffleruby/language/methods/CallInternalMethodNode.java

@@ -90,7 +90,7 @@ protected Object alwaysInlined(
 
         try {
             RubyCheckArityRootNode
-                    .checkArity(cachedArity, args.length, checkArityProfile, contextRef, alwaysInlinedNode);
+                    .checkArity(cachedArity, args.length, checkArityProfile, alwaysInlinedNode);
 
             return alwaysInlinedNode.execute(frame, self, args, block, cachedCallTarget);
         } catch (RaiseException e) {