Do not cache the RubyContext in LookupMethodNode

Author: eregon

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

@@ -23,7 +23,6 @@
 import org.truffleruby.language.objects.MetaClassNode;
 
 import com.oracle.truffle.api.CompilerAsserts;
-import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.CachedContext;
 import com.oracle.truffle.api.dsl.GenerateUncached;
@@ -45,24 +44,20 @@ public abstract InternalMethod execute(Frame frame, RubyClass metaClass, String
             DispatchConfiguration config);
 
     @Specialization(
-            guards = {
-                    "metaClass == cachedMetaClass",
-                    "name == cachedName",
-                    "config == cachedConfig",
-                    "contextReference.get() == cachedContext" },
+            // no need to guard on the context, the metaClass is context-specific
+            guards = { "metaClass == cachedMetaClass", "name == cachedName", "config == cachedConfig" },
             assumptions = "methodLookupResult.getAssumptions()",
             limit = "getCacheLimit()")
     protected InternalMethod lookupMethodCached(
             Frame frame,
             RubyClass metaClass,
             String name,
             DispatchConfiguration config,
-            @CachedContext(RubyLanguage.class) TruffleLanguage.ContextReference<RubyContext> contextReference,
-            @Cached("contextReference.get()") RubyContext cachedContext,
+            @CachedContext(RubyLanguage.class) RubyContext context,
             @Cached("metaClass") RubyClass cachedMetaClass,
             @Cached("name") String cachedName,
             @Cached("config") DispatchConfiguration cachedConfig,
-            @Cached("lookupCached(cachedContext, frame, cachedMetaClass, cachedName, config)") MethodLookupResult methodLookupResult) {
+            @Cached("lookupCached(context, frame, cachedMetaClass, cachedName, config)") MethodLookupResult methodLookupResult) {
 
         return methodLookupResult.getMethod();
     }