Reduce usages of RubyLanguage#getCurrentContext()

Author: eregon

src/main/java/org/truffleruby/RubyLanguage.java

@@ -487,7 +487,7 @@ protected RootCallTarget parse(ParsingRequest request) {
                     ? ParserContext.TOP_LEVEL_FIRST
                     : ParserContext.TOP_LEVEL;
             final LexicalScope lexicalScope = contextIfSingleContext.map(RubyContext::getRootLexicalScope).orElse(null);
-            return RubyLanguage.getCurrentContext().getCodeLoader().parse(
+            return getCurrentContext().getCodeLoader().parse(
                     rubySource,
                     parserContext,
                     null,

src/main/java/org/truffleruby/core/format/FormatEncoding.java

@@ -17,7 +17,6 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import org.truffleruby.RubyContext;
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.encoding.Encodings;
 import org.truffleruby.core.encoding.RubyEncoding;
 import org.truffleruby.language.control.RaiseException;
@@ -61,7 +60,7 @@ public static FormatEncoding find(Encoding encoding, Node currentNode) {
         }
 
         // TODO (kjmenard 17-Oct-18): This entire enum needs to be rethought since a format string can take on any encoding, not just the 3 codified here.
-        RubyContext context = RubyLanguage.getCurrentContext();
+        RubyContext context = RubyContext.get(currentNode);
         throw new RaiseException(
                 context,
                 context.getCoreExceptions().runtimeError("Can't find format encoding for " + encoding, currentNode));

src/main/java/org/truffleruby/core/module/ModuleNodes.java

@@ -26,7 +26,6 @@
 import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.profiles.LoopConditionProfile;
 import org.truffleruby.RubyContext;
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.builtins.CoreMethod;
 import org.truffleruby.builtins.CoreMethodArrayArgumentsNode;
 import org.truffleruby.builtins.CoreMethodNode;
@@ -473,8 +472,6 @@ private void createAccessors(RubyModule module, Object[] names, Accessor accesso
         private void createAccessor(RubyModule module, String name, Accessor accessor, Visibility visibility,
                 SourceSection sourceSection) {
             assert accessor != BOTH;
-            final RubyContext context = RubyLanguage.getCurrentContext();
-            final RubyLanguage language = context.getLanguageSlow();
             final Arity arity = accessor == READER ? Arity.NO_ARGUMENTS : Arity.ONE_REQUIRED;
             final String ivar = "@" + name;
             final String accessorName = accessor == READER ? name : name + "=";
@@ -494,7 +491,7 @@ private void createAccessor(RubyModule module, String name, Accessor accessor, V
                     : GeneratedWriterNodeFactory.getInstance();
 
             final RubyRootNode reRaiseRootNode = new RubyRootNode(
-                    language,
+                    getLanguage(),
                     sourceSection,
                     null,
                     sharedMethodInfo,
@@ -504,7 +501,7 @@ private void createAccessor(RubyModule module, String name, Accessor accessor, V
             final RootCallTarget callTarget = Truffle.getRuntime().createCallTarget(reRaiseRootNode);
 
             final InternalMethod method = new InternalMethod(
-                    context,
+                    getContext(),
                     sharedMethodInfo,
                     LexicalScope.IGNORE,
                     DeclarationContext.NONE,
@@ -518,7 +515,7 @@ private void createAccessor(RubyModule module, String name, Accessor accessor, V
                     null,
                     nil);
 
-            module.fields.addMethod(context, this, method);
+            module.fields.addMethod(getContext(), this, method);
         }
     }
 
@@ -545,10 +542,7 @@ protected Object attr(
         private void warnObsoletedBooleanArgument() {
             final UncachedWarningNode warningNode = UncachedWarningNode.INSTANCE;
             if (warningNode.shouldWarn()) {
-                final SourceSection sourceSection = RubyLanguage
-                        .getCurrentContext()
-                        .getCallStack()
-                        .getTopMostUserSourceSection();
+                final SourceSection sourceSection = getContext().getCallStack().getTopMostUserSourceSection();
                 warningNode.warningMessage(sourceSection, "optional boolean argument is obsoleted");
             }
         }

src/main/java/org/truffleruby/interop/TranslateInteropRubyExceptionNode.java

@@ -11,8 +11,6 @@
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.interop.UnknownKeyException;
-import org.truffleruby.RubyContext;
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.cast.IntegerCastNode;
 import org.truffleruby.core.exception.RubyException;
 import org.truffleruby.language.RubyBaseNode;
@@ -166,12 +164,11 @@ protected AssertionError fallback(RaiseException exception, long index, String i
 
     @TruffleBoundary
     protected AssertionError handleBadErrorType(InteropException e, RaiseException rubyException) {
-        RubyContext context = RubyLanguage.getCurrentContext();
-        final RubyException exception = context.getCoreExceptions().runtimeError(
+        final RubyException exception = coreExceptions().runtimeError(
                 Utils.concat("Wrong exception raised from a Ruby method implementing polyglot behavior: ", e),
                 this);
         exception.cause = rubyException;
-        throw new RaiseException(context, exception);
+        throw new RaiseException(getContext(), exception);
     }
 
 }

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

@@ -84,13 +84,13 @@ public static class UncachedWarnNode extends RubyBaseNode {
         }
 
         public boolean shouldWarn() {
-            return RubyLanguage.getCurrentContext().getCoreLibrary().warningsEnabled();
+            return coreLibrary().warningsEnabled();
         }
 
         public void warningMessage(SourceSection sourceSection, String message) {
             assert shouldWarn();
             WarnNode.callWarn(
-                    RubyLanguage.getCurrentContext(),
+                    getContext(),
                     sourceSection,
                     message,
                     MakeStringNode.getUncached(),

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

@@ -9,7 +9,6 @@
  */
 package org.truffleruby.language;
 
-import org.truffleruby.RubyLanguage;
 
 /** Warns only if $VERBOSE is true. Corresponds to Kernel#warn(message, uplevel: 1) if $VERBOSE, but in Java with a
  * given SourceSection. */
@@ -30,7 +29,7 @@ private UncachedWarningNode() {
 
         @Override
         public boolean shouldWarn() {
-            return RubyLanguage.getCurrentContext().getCoreLibrary().isVerbose();
+            return coreLibrary().isVerbose();
         }
     }