Reduce usages of RubyLanguage#getCurrentLanguage()

eregon · eregon · commit a9dc560332fb · 2021-08-09T22:10:15.000+02:00
diff --git a/src/main/java/org/truffleruby/cext/UnwrapNode.java b/src/main/java/org/truffleruby/cext/UnwrapNode.java
@@ -18,7 +18,6 @@
 import com.oracle.truffle.api.interop.InvalidArrayIndexException;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.profiles.LoopConditionProfile;
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.cext.UnwrapNodeGen.NativeToWrapperNodeGen;
 import org.truffleruby.cext.UnwrapNodeGen.ToWrapperNodeGen;
 import org.truffleruby.cext.UnwrapNodeGen.UnwrapNativeNodeGen;
@@ -287,6 +286,6 @@ protected Object unwrapGeneric(Object value,
     }
 
     protected int getCacheLimit() {
-        return RubyLanguage.getCurrentLanguage().options.DISPATCH_CACHE;
+        return getLanguage().options.DISPATCH_CACHE;
     }
 }
diff --git a/src/main/java/org/truffleruby/cext/ValueWrapperManager.java b/src/main/java/org/truffleruby/cext/ValueWrapperManager.java
@@ -347,7 +347,7 @@ protected static Thread currentJavaThread(ValueWrapper wrapper) {
         }
 
         public int getCacheLimit() {
-            return RubyLanguage.getCurrentLanguage().options.THREAD_CACHE;
+            return getLanguage().options.THREAD_CACHE;
         }
 
         public static GetHandleBlockHolderNode create() {
diff --git a/src/main/java/org/truffleruby/core/MarkingServiceNodes.java b/src/main/java/org/truffleruby/core/MarkingServiceNodes.java
@@ -11,7 +11,6 @@
 
 import java.util.ArrayList;
 
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.MarkingService.MarkerThreadLocalData;
 import org.truffleruby.language.RubyBaseNode;
 
@@ -70,7 +69,7 @@ protected static Thread currentJavaThread(Object dynamicParameter) {
         }
 
         public int getCacheLimit() {
-            return RubyLanguage.getCurrentLanguage().options.THREAD_CACHE;
+            return getLanguage().options.THREAD_CACHE;
         }
 
         public static GetMarkerThreadLocalDataNode create() {
diff --git a/src/main/java/org/truffleruby/core/basicobject/BasicObjectNodes.java b/src/main/java/org/truffleruby/core/basicobject/BasicObjectNodes.java
@@ -13,7 +13,6 @@
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.object.Shape;
 import org.truffleruby.Layouts;
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.builtins.CoreMethod;
 import org.truffleruby.builtins.CoreMethodArrayArgumentsNode;
 import org.truffleruby.builtins.CoreModule;
@@ -273,7 +272,7 @@ private int hashCode(Object object) {
         }
 
         protected int getCacheLimit() {
-            return RubyLanguage.getCurrentLanguage().options.INSTANCE_VARIABLE_CACHE;
+            return getLanguage().options.INSTANCE_VARIABLE_CACHE;
         }
     }
 
diff --git a/src/main/java/org/truffleruby/core/binding/BindingNodes.java b/src/main/java/org/truffleruby/core/binding/BindingNodes.java
@@ -192,7 +192,7 @@ protected boolean localVariableDefinedUncached(RubyBinding binding, String name)
         }
 
         protected int getCacheLimit() {
-            return RubyLanguage.getCurrentLanguage().options.BINDING_LOCAL_VARIABLE_CACHE;
+            return getLanguage().options.BINDING_LOCAL_VARIABLE_CACHE;
         }
 
     }
@@ -240,7 +240,7 @@ protected Object localVariableDefinedLastLine(RubyBinding binding, String name)
         }
 
         protected int getCacheLimit() {
-            return RubyLanguage.getCurrentLanguage().options.BINDING_LOCAL_VARIABLE_CACHE;
+            return getLanguage().options.BINDING_LOCAL_VARIABLE_CACHE;
         }
 
     }
@@ -286,7 +286,7 @@ protected Object localVariableGetLastLine(RubyBinding binding, String name) {
         }
 
         protected int getCacheLimit() {
-            return RubyLanguage.getCurrentLanguage().options.BINDING_LOCAL_VARIABLE_CACHE;
+            return getLanguage().options.BINDING_LOCAL_VARIABLE_CACHE;
         }
 
     }
@@ -381,7 +381,7 @@ protected WriteFrameSlotNode createWriteNode(FrameSlotAndDepth frameSlot) {
         }
 
         protected int getCacheLimit() {
-            return RubyLanguage.getCurrentLanguage().options.BINDING_LOCAL_VARIABLE_CACHE;
+            return getLanguage().options.BINDING_LOCAL_VARIABLE_CACHE;
         }
     }
 
diff --git a/src/main/java/org/truffleruby/core/cast/BooleanCastNode.java b/src/main/java/org/truffleruby/core/cast/BooleanCastNode.java
@@ -9,7 +9,6 @@
  */
 package org.truffleruby.core.cast;
 
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.language.ImmutableRubyObject;
 import org.truffleruby.language.Nil;
 import org.truffleruby.language.RubyBaseNode;
@@ -102,6 +101,6 @@ protected boolean doForeignObject(Object object,
     }
 
     protected int getCacheLimit() {
-        return RubyLanguage.getCurrentLanguage().options.METHOD_LOOKUP_CACHE;
+        return getLanguage().options.METHOD_LOOKUP_CACHE;
     }
 }
diff --git a/src/main/java/org/truffleruby/core/cast/ToSymbolNode.java b/src/main/java/org/truffleruby/core/cast/ToSymbolNode.java
@@ -11,7 +11,6 @@
 
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.library.CachedLibrary;
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.encoding.RubyEncoding;
 import org.truffleruby.core.rope.Rope;
 import org.truffleruby.core.rope.RopeNodes;
@@ -74,6 +73,6 @@ protected RubySymbol toSymbolRubyStringUncached(Object str,
     }
 
     protected int getCacheLimit() {
-        return RubyLanguage.getCurrentLanguage().options.DISPATCH_CACHE;
+        return getLanguage().options.DISPATCH_CACHE;
     }
 }
diff --git a/src/main/java/org/truffleruby/core/kernel/KernelNodes.java b/src/main/java/org/truffleruby/core/kernel/KernelNodes.java
@@ -20,7 +20,6 @@
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.utilities.AssumedValue;
 import org.truffleruby.RubyContext;
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.builtins.CoreMethod;
 import org.truffleruby.builtins.CoreMethodArrayArgumentsNode;
 import org.truffleruby.builtins.CoreMethodNode;
@@ -920,7 +919,7 @@ protected static boolean assignsNewUserVariables(FrameDescriptor descriptor) {
         }
 
         protected int getCacheLimit() {
-            return RubyLanguage.getCurrentLanguage().options.EVAL_CACHE;
+            return getLanguage().options.EVAL_CACHE;
         }
     }
 
diff --git a/src/main/java/org/truffleruby/interop/ForeignToRubyArgumentsNode.java b/src/main/java/org/truffleruby/interop/ForeignToRubyArgumentsNode.java
@@ -9,7 +9,6 @@
  */
 package org.truffleruby.interop;
 
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.language.RubyBaseNode;
 
 import com.oracle.truffle.api.dsl.Cached;
@@ -63,7 +62,7 @@ protected static ForeignToRubyNode[] foreignToRubyNodes(int size) {
     }
 
     protected int getLimit() {
-        return RubyLanguage.getCurrentLanguage().options.INTEROP_CONVERT_CACHE;
+        return getLanguage().options.INTEROP_CONVERT_CACHE;
     }
 
 }
diff --git a/src/main/java/org/truffleruby/interop/FromJavaStringNode.java b/src/main/java/org/truffleruby/interop/FromJavaStringNode.java
@@ -10,7 +10,6 @@
 package org.truffleruby.interop;
 
 import org.jcodings.specific.UTF8Encoding;
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.encoding.Encodings;
 import org.truffleruby.core.rope.CodeRange;
 import org.truffleruby.core.rope.Rope;
@@ -58,7 +57,7 @@ protected Rope getRope(String value) {
     }
 
     protected int getLimit() {
-        return RubyLanguage.getCurrentLanguage().options.INTEROP_CONVERT_CACHE;
+        return getLanguage().options.INTEROP_CONVERT_CACHE;
     }
 
 }
diff --git a/src/main/java/org/truffleruby/interop/OutgoingForeignCallNode.java b/src/main/java/org/truffleruby/interop/OutgoingForeignCallNode.java
@@ -11,7 +11,6 @@
 
 import java.util.Arrays;
 
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.array.ArrayUtils;
 import org.truffleruby.core.cast.NameToJavaStringNode;
 import org.truffleruby.core.cast.ToSymbolNode;
@@ -486,7 +485,7 @@ protected abstract static class PrimitiveConversionForOperatorAndReDispatchOutgo
             RubyBaseNode {
 
         protected int getCacheLimit() {
-            return RubyLanguage.getCurrentLanguage().options.METHOD_LOOKUP_CACHE;
+            return getLanguage().options.METHOD_LOOKUP_CACHE;
         }
 
         protected abstract Object executeCall(Object receiver, String name, Object[] args);
diff --git a/src/main/java/org/truffleruby/interop/RubyToForeignArgumentsNode.java b/src/main/java/org/truffleruby/interop/RubyToForeignArgumentsNode.java
@@ -9,7 +9,6 @@
  */
 package org.truffleruby.interop;
 
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.language.RubyBaseNode;
 
 import com.oracle.truffle.api.dsl.Cached;
@@ -55,7 +54,7 @@ protected Object[] convertUncached(Object[] args,
     }
 
     protected int getLimit() {
-        return RubyLanguage.getCurrentLanguage().options.INTEROP_CONVERT_CACHE;
+        return getLanguage().options.INTEROP_CONVERT_CACHE;
     }
 
 }
diff --git a/src/main/java/org/truffleruby/interop/ToJavaStringNode.java b/src/main/java/org/truffleruby/interop/ToJavaStringNode.java
@@ -10,7 +10,6 @@
 package org.truffleruby.interop;
 
 import com.oracle.truffle.api.library.CachedLibrary;
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.rope.Rope;
 import org.truffleruby.core.rope.RopeNodes;
 import org.truffleruby.core.rope.RopeOperations;
@@ -100,7 +99,7 @@ protected String javaStringUncached(String value) {
     }
 
     protected int getLimit() {
-        return RubyLanguage.getCurrentLanguage().options.INTEROP_CONVERT_CACHE;
+        return getLanguage().options.INTEROP_CONVERT_CACHE;
     }
 
 }
diff --git a/src/main/java/org/truffleruby/language/RubyBaseNode.java b/src/main/java/org/truffleruby/language/RubyBaseNode.java
@@ -44,8 +44,8 @@ public abstract class RubyBaseNode extends Node {
 
     public static final int MAX_EXPLODE_SIZE = 16;
 
-    public static boolean isSingleContext() {
-        return RubyLanguage.getCurrentLanguage().singleContext;
+    public boolean isSingleContext() {
+        return getLanguage().singleContext;
     }
 
     public static Object nilToNull(Object value) {
@@ -159,7 +159,7 @@ protected final CoreExceptions coreExceptions() {
     }
 
     protected int getIdentityCacheContextLimit() {
-        return RubyLanguage.getCurrentLanguage().options.CONTEXT_SPECIFIC_IDENTITY_CACHE;
+        return getLanguage().options.CONTEXT_SPECIFIC_IDENTITY_CACHE;
     }
 
     protected final int getIdentityCacheLimit() {
diff --git a/src/main/java/org/truffleruby/language/methods/CallInternalMethodNode.java b/src/main/java/org/truffleruby/language/methods/CallInternalMethodNode.java
@@ -18,7 +18,6 @@
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.utilities.AlwaysValidAssumption;
 import org.truffleruby.RubyContext;
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.builtins.CoreMethodNodeManager;
 import org.truffleruby.core.inlined.AlwaysInlinedMethodNode;
 import org.truffleruby.language.RubyBaseNode;
@@ -166,7 +165,7 @@ protected Assumption getMethodAssumption(InternalMethod method) {
     }
 
     protected int getCacheLimit() {
-        return RubyLanguage.getCurrentLanguage().options.DISPATCH_CACHE;
+        return getLanguage().options.DISPATCH_CACHE;
     }
 
     protected DirectCallNode createCall(String methodName, RootCallTarget callTarget) {
diff --git a/src/main/java/org/truffleruby/language/methods/LookupMethodNode.java b/src/main/java/org/truffleruby/language/methods/LookupMethodNode.java
@@ -10,7 +10,6 @@
 package org.truffleruby.language.methods;
 
 import org.truffleruby.RubyContext;
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.klass.RubyClass;
 import org.truffleruby.core.module.MethodLookupResult;
 import org.truffleruby.core.module.ModuleFields;
@@ -187,6 +186,6 @@ private static RubyClass getCallerClass(RubyContext context, Frame callingFrame)
     }
 
     protected int getCacheLimit() {
-        return RubyLanguage.getCurrentLanguage().options.METHOD_LOOKUP_CACHE;
+        return getLanguage().options.METHOD_LOOKUP_CACHE;
     }
 }
diff --git a/src/main/java/org/truffleruby/language/objects/CheckIVarNameNode.java b/src/main/java/org/truffleruby/language/objects/CheckIVarNameNode.java
@@ -9,7 +9,6 @@
  */
 package org.truffleruby.language.objects;
 
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.symbol.SymbolTable;
 import org.truffleruby.language.RubyBaseNode;
 import org.truffleruby.language.RubyDynamicObject;
@@ -41,7 +40,7 @@ protected void uncached(RubyDynamicObject object, String name) {
     }
 
     protected int getCacheLimit() {
-        return RubyLanguage.getCurrentLanguage().options.INSTANCE_VARIABLE_CACHE;
+        return getLanguage().options.INSTANCE_VARIABLE_CACHE;
     }
 
 }
diff --git a/src/main/java/org/truffleruby/language/objects/IsANode.java b/src/main/java/org/truffleruby/language/objects/IsANode.java
@@ -11,7 +11,6 @@
 
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.profiles.ConditionProfile;
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.klass.RubyClass;
 import org.truffleruby.core.module.ModuleOperations;
 import org.truffleruby.core.module.RubyModule;
@@ -98,7 +97,7 @@ protected boolean isA(RubyClass metaClass, RubyModule module) {
     }
 
     protected int getCacheLimit() {
-        return RubyLanguage.getCurrentLanguage().options.IS_A_CACHE;
+        return getLanguage().options.IS_A_CACHE;
     }
 
 }
diff --git a/src/main/java/org/truffleruby/language/objects/LogicalClassNode.java b/src/main/java/org/truffleruby/language/objects/LogicalClassNode.java
@@ -9,7 +9,6 @@
  */
 package org.truffleruby.language.objects;
 
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.encoding.RubyEncoding;
 import org.truffleruby.core.klass.RubyClass;
 import org.truffleruby.core.numeric.RubyBignum;
@@ -103,7 +102,7 @@ protected RubyClass logicalClassForeign(Object object) {
     }
 
     protected int getCacheLimit() {
-        return RubyLanguage.getCurrentLanguage().options.CLASS_CACHE;
+        return getLanguage().options.CLASS_CACHE;
     }
 
 }
diff --git a/src/main/java/org/truffleruby/language/objects/MetaClassNode.java b/src/main/java/org/truffleruby/language/objects/MetaClassNode.java
@@ -9,7 +9,6 @@
  */
 package org.truffleruby.language.objects;
 
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.encoding.RubyEncoding;
 import org.truffleruby.core.klass.RubyClass;
 import org.truffleruby.core.numeric.RubyBignum;
@@ -119,10 +118,10 @@ protected RubyClass metaClassForeign(Object object) {
     }
 
     protected int getCacheLimit() {
-        return RubyLanguage.getCurrentLanguage().options.CLASS_CACHE;
+        return getLanguage().options.CLASS_CACHE;
     }
 
     protected int getIdentityCacheContextLimit() {
-        return RubyLanguage.getCurrentLanguage().options.CONTEXT_SPECIFIC_IDENTITY_CACHE;
+        return getLanguage().options.CONTEXT_SPECIFIC_IDENTITY_CACHE;
     }
 }
diff --git a/src/main/java/org/truffleruby/language/objects/SingletonClassNode.java b/src/main/java/org/truffleruby/language/objects/SingletonClassNode.java
@@ -11,7 +11,6 @@
 
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import org.truffleruby.RubyContext;
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.klass.ClassNodes;
 import org.truffleruby.core.klass.RubyClass;
 import org.truffleruby.language.ImmutableRubyObject;
@@ -143,11 +142,11 @@ protected RubyClass getSingletonClassForInstance(RubyContext context, RubyDynami
     }
 
     protected int getCacheLimit() {
-        return RubyLanguage.getCurrentLanguage().options.CLASS_CACHE;
+        return getLanguage().options.CLASS_CACHE;
     }
 
     protected int getIdentityCacheContextLimit() {
-        return RubyLanguage.getCurrentLanguage().options.CONTEXT_SPECIFIC_IDENTITY_CACHE;
+        return getLanguage().options.CONTEXT_SPECIFIC_IDENTITY_CACHE;
     }
 
 }
diff --git a/src/main/java/org/truffleruby/language/objects/WriteObjectFieldNode.java b/src/main/java/org/truffleruby/language/objects/WriteObjectFieldNode.java
@@ -10,7 +10,6 @@
 package org.truffleruby.language.objects;
 
 import com.oracle.truffle.api.memory.MemoryFence;
-import org.truffleruby.RubyLanguage;
 import org.truffleruby.language.RubyBaseNode;
 import org.truffleruby.language.RubyDynamicObject;
 import org.truffleruby.language.objects.shared.WriteBarrierNode;
@@ -68,6 +67,6 @@ protected void writeShared(RubyDynamicObject object, Object name, Object value,
     }
 
     protected int getCacheLimit() {
-        return RubyLanguage.getCurrentLanguage().options.INSTANCE_VARIABLE_CACHE;
+        return getLanguage().options.INSTANCE_VARIABLE_CACHE;
     }
 }
diff --git a/src/main/java/org/truffleruby/language/yield/CallBlockNode.java b/src/main/java/org/truffleruby/language/yield/CallBlockNode.java

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`	`import com.oracle.truffle.api.interop.InvalidArrayIndexException;`
`19`	`19`	`import com.oracle.truffle.api.nodes.ExplodeLoop;`
`20`	`20`	`import com.oracle.truffle.api.profiles.LoopConditionProfile;`
`21`		`-import org.truffleruby.RubyLanguage;`
`22`	`21`	`import org.truffleruby.cext.UnwrapNodeGen.NativeToWrapperNodeGen;`
`23`	`22`	`import org.truffleruby.cext.UnwrapNodeGen.ToWrapperNodeGen;`
`24`	`23`	`import org.truffleruby.cext.UnwrapNodeGen.UnwrapNativeNodeGen;`
`@@ -287,6 +286,6 @@ protected Object unwrapGeneric(Object value,`
`287`	`286`	`}`
`288`	`287`
`289`	`288`	`protected int getCacheLimit() {`
`290`		`- return RubyLanguage.getCurrentLanguage().options.DISPATCH_CACHE;`
	`289`	`+ return getLanguage().options.DISPATCH_CACHE;`
`291`	`290`	`}`
`292`	`291`	`}`
Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ protected static Thread currentJavaThread(ValueWrapper wrapper) {`
`347`	`347`	`}`
`348`	`348`
`349`	`349`	`public int getCacheLimit() {`
`350`		`- return RubyLanguage.getCurrentLanguage().options.THREAD_CACHE;`
	`350`	`+ return getLanguage().options.THREAD_CACHE;`
`351`	`351`	`}`
`352`	`352`
`353`	`353`	`public static GetHandleBlockHolderNode create() {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`
`12`	`12`	`import java.util.ArrayList;`
`13`	`13`
`14`		`-import org.truffleruby.RubyLanguage;`
`15`	`14`	`import org.truffleruby.core.MarkingService.MarkerThreadLocalData;`
`16`	`15`	`import org.truffleruby.language.RubyBaseNode;`
`17`	`16`
`@@ -70,7 +69,7 @@ protected static Thread currentJavaThread(Object dynamicParameter) {`
`70`	`69`	`}`
`71`	`70`
`72`	`71`	`public int getCacheLimit() {`
`73`		`- return RubyLanguage.getCurrentLanguage().options.THREAD_CACHE;`
	`72`	`+ return getLanguage().options.THREAD_CACHE;`
`74`	`73`	`}`
`75`	`74`
`76`	`75`	`public static GetMarkerThreadLocalDataNode create() {`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`	`import com.oracle.truffle.api.dsl.Fallback;`
`14`	`14`	`import com.oracle.truffle.api.object.Shape;`
`15`	`15`	`import org.truffleruby.Layouts;`
`16`		`-import org.truffleruby.RubyLanguage;`
`17`	`16`	`import org.truffleruby.builtins.CoreMethod;`
`18`	`17`	`import org.truffleruby.builtins.CoreMethodArrayArgumentsNode;`
`19`	`18`	`import org.truffleruby.builtins.CoreModule;`
`@@ -273,7 +272,7 @@ private int hashCode(Object object) {`
`273`	`272`	`}`
`274`	`273`
`275`	`274`	`protected int getCacheLimit() {`
`276`		`- return RubyLanguage.getCurrentLanguage().options.INSTANCE_VARIABLE_CACHE;`
	`275`	`+ return getLanguage().options.INSTANCE_VARIABLE_CACHE;`
`277`	`276`	`}`
`278`	`277`	`}`
`279`	`278`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ protected boolean localVariableDefinedUncached(RubyBinding binding, String name)`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`protected int getCacheLimit() {`
`195`		`- return RubyLanguage.getCurrentLanguage().options.BINDING_LOCAL_VARIABLE_CACHE;`
	`195`	`+ return getLanguage().options.BINDING_LOCAL_VARIABLE_CACHE;`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`}`
`@@ -240,7 +240,7 @@ protected Object localVariableDefinedLastLine(RubyBinding binding, String name)`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`protected int getCacheLimit() {`
`243`		`- return RubyLanguage.getCurrentLanguage().options.BINDING_LOCAL_VARIABLE_CACHE;`
	`243`	`+ return getLanguage().options.BINDING_LOCAL_VARIABLE_CACHE;`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`}`
`@@ -286,7 +286,7 @@ protected Object localVariableGetLastLine(RubyBinding binding, String name) {`
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`protected int getCacheLimit() {`
`289`		`- return RubyLanguage.getCurrentLanguage().options.BINDING_LOCAL_VARIABLE_CACHE;`
	`289`	`+ return getLanguage().options.BINDING_LOCAL_VARIABLE_CACHE;`
`290`	`290`	`}`
`291`	`291`
`292`	`292`	`}`
`@@ -381,7 +381,7 @@ protected WriteFrameSlotNode createWriteNode(FrameSlotAndDepth frameSlot) {`
`381`	`381`	`}`
`382`	`382`
`383`	`383`	`protected int getCacheLimit() {`
`384`		`- return RubyLanguage.getCurrentLanguage().options.BINDING_LOCAL_VARIABLE_CACHE;`
	`384`	`+ return getLanguage().options.BINDING_LOCAL_VARIABLE_CACHE;`
`385`	`385`	`}`
`386`	`386`	`}`
`387`	`387`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`*/`
`10`	`10`	`package org.truffleruby.core.cast;`
`11`	`11`
`12`		`-import org.truffleruby.RubyLanguage;`
`13`	`12`	`import org.truffleruby.language.ImmutableRubyObject;`
`14`	`13`	`import org.truffleruby.language.Nil;`
`15`	`14`	`import org.truffleruby.language.RubyBaseNode;`
`@@ -102,6 +101,6 @@ protected boolean doForeignObject(Object object,`
`102`	`101`	`}`
`103`	`102`
`104`	`103`	`protected int getCacheLimit() {`
`105`		`- return RubyLanguage.getCurrentLanguage().options.METHOD_LOOKUP_CACHE;`
	`104`	`+ return getLanguage().options.METHOD_LOOKUP_CACHE;`
`106`	`105`	`}`
`107`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`import com.oracle.truffle.api.frame.Frame;`
`21`	`21`	`import com.oracle.truffle.api.utilities.AssumedValue;`
`22`	`22`	`import org.truffleruby.RubyContext;`
`23`		`-import org.truffleruby.RubyLanguage;`
`24`	`23`	`import org.truffleruby.builtins.CoreMethod;`
`25`	`24`	`import org.truffleruby.builtins.CoreMethodArrayArgumentsNode;`
`26`	`25`	`import org.truffleruby.builtins.CoreMethodNode;`
`@@ -920,7 +919,7 @@ protected static boolean assignsNewUserVariables(FrameDescriptor descriptor) {`
`920`	`919`	`}`
`921`	`920`
`922`	`921`	`protected int getCacheLimit() {`
`923`		`- return RubyLanguage.getCurrentLanguage().options.EVAL_CACHE;`
	`922`	`+ return getLanguage().options.EVAL_CACHE;`
`924`	`923`	`}`
`925`	`924`	`}`
`926`	`925`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`package org.truffleruby.interop;`
`11`	`11`
`12`	`12`	`import org.jcodings.specific.UTF8Encoding;`
`13`		`-import org.truffleruby.RubyLanguage;`
`14`	`13`	`import org.truffleruby.core.encoding.Encodings;`
`15`	`14`	`import org.truffleruby.core.rope.CodeRange;`
`16`	`15`	`import org.truffleruby.core.rope.Rope;`
`@@ -58,7 +57,7 @@ protected Rope getRope(String value) {`
`58`	`57`	`}`
`59`	`58`
`60`	`59`	`protected int getLimit() {`
`61`		`- return RubyLanguage.getCurrentLanguage().options.INTEROP_CONVERT_CACHE;`
	`60`	`+ return getLanguage().options.INTEROP_CONVERT_CACHE;`
`62`	`61`	`}`
`63`	`62`
`64`	`63`	`}`