Remove LookupInMROBaseNode.contextRef

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/LookupAttributeInMRONode.java

@@ -61,9 +61,7 @@
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.TruffleLanguage.ContextReference;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.CachedContext;
@@ -115,12 +113,9 @@ public static LookupAttributeInMRONode.Dynamic getUncached() {
 
     private final boolean skipPythonClasses;
     protected final String key;
-    @CompilationFinal private ContextReference<PythonContext> contextRef;
     @Child private TypeNodes.IsSameTypeNode isSameTypeNode = IsSameTypeNodeGen.create();
     @Child private GetMroStorageNode getMroNode;
 
-    protected static final int MAX_DICT_TYPES = ReadAttributeFromObjectNode.MAX_DICT_TYPES;
-
     public LookupAttributeInMRONode(String key, boolean skipPythonClasses) {
         this.key = key;
         this.skipPythonClasses = skipPythonClasses;
@@ -158,7 +153,8 @@ public static Object findAttr(PythonCore core, PythonBuiltinClassType klass, Obj
     @Specialization(guards = {"klass == cachedKlass"}, limit = "getAttributeAccessInlineCacheMaxDepth()", assumptions = "singleContextAssumption()")
     protected static Object lookupPBCTCached(@SuppressWarnings("unused") PythonBuiltinClassType klass,
                     @Cached("klass") @SuppressWarnings("unused") PythonBuiltinClassType cachedKlass,
-                    @Cached("findAttr(getCore(), cachedKlass, key)") Object cachedValue) {
+                    @SuppressWarnings("unused") @CachedContext(PythonLanguage.class) PythonContext ctx,
+                    @Cached("findAttr(ctx.getCore(), cachedKlass, key)") Object cachedValue) {
         return cachedValue;
     }
 
@@ -173,7 +169,8 @@ protected static boolean canCache(Object value) {
     @Specialization(guards = {"klass == cachedKlass", "canCache(cachedValue)"}, limit = "getAttributeAccessInlineCacheMaxDepth()")
     protected static Object lookupPBCTCachedMulti(@SuppressWarnings("unused") PythonBuiltinClassType klass,
                     @Cached("klass") @SuppressWarnings("unused") PythonBuiltinClassType cachedKlass,
-                    @Cached("findAttr(getCore(), cachedKlass, key)") Object cachedValue) {
+                    @SuppressWarnings("unused") @CachedContext(PythonLanguage.class) PythonContext ctx,
+                    @Cached("findAttr(ctx.getCore(), cachedKlass, key)") Object cachedValue) {
         return cachedValue;
     }
 
@@ -192,19 +189,21 @@ public static PythonBuiltinClassType findOwnerInMro(PythonCore core, PythonBuilt
     @Specialization(replaces = "lookupPBCTCached", guards = "klass == cachedKlass", limit = "getAttributeAccessInlineCacheMaxDepth()")
     protected Object lookupPBCTCachedOwner(@SuppressWarnings("unused") PythonBuiltinClassType klass,
                     @Cached("klass") @SuppressWarnings("unused") PythonBuiltinClassType cachedKlass,
-                    @Cached("findOwnerInMro(getCore(), cachedKlass, key)") PythonBuiltinClassType ownerKlass,
+                    @CachedContext(PythonLanguage.class) PythonContext ctx,
+                    @Cached("findOwnerInMro(ctx.getCore(), cachedKlass, key)") PythonBuiltinClassType ownerKlass,
                     @Cached ReadAttributeFromDynamicObjectNode readAttrNode) {
         if (ownerKlass == null) {
             return PNone.NO_VALUE;
         } else {
-            return readAttrNode.execute(getCore().lookupType(ownerKlass), key);
+            return readAttrNode.execute(ctx.getCore().lookupType(ownerKlass), key);
         }
     }
 
     @Specialization(replaces = "lookupPBCTCachedOwner")
     protected Object lookupPBCTGeneric(PythonBuiltinClassType klass,
+                    @CachedContext(PythonLanguage.class) PythonContext ctx,
                     @Cached ReadAttributeFromDynamicObjectNode readAttrNode) {
-        return findAttr(getCore(), klass, key, readAttrNode);
+        return findAttr(ctx.getCore(), klass, key, readAttrNode);
     }
 
     static final class AttributeAssumptionPair {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/LookupCallableSlotInMRONode.java

@@ -47,9 +47,11 @@
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
+import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.CachedContext;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 
@@ -103,7 +105,8 @@ static Object doBuiltinCachedSingleCtx(@SuppressWarnings("unused") PythonBuiltin
                     assumptions = {"singleContextAssumption()"}, limit = "getAttributeAccessInlineCacheMaxDepth()")
     static Object doBuiltinTypeCachedSingleCtx(@SuppressWarnings("unused") PythonBuiltinClassType klassType,
                     @SuppressWarnings("unused") @Cached("klassType") PythonBuiltinClassType cachedKlassType,
-                    @Cached("slot.getValue(getCore().lookupType(cachedKlassType))") Object value) {
+                    @SuppressWarnings("unused") @CachedContext(PythonLanguage.class) PythonContext ctx,
+                    @Cached("slot.getValue(ctx.getCore().lookupType(cachedKlassType))") Object value) {
         return value;
     }
 
@@ -152,12 +155,13 @@ static Object doBuiltinTypeMultiContext(@SuppressWarnings("unused") PythonBuilti
     // Fallback when the cache with PythonBuiltinClassType overflows:
 
     @Specialization(replaces = {"doBuiltinTypeCached", "doBuiltinTypeCachedSingleCtx", "doBuiltinTypeMultiContext"})
-    Object doBuiltinTypeGeneric(PythonBuiltinClassType klass) {
+    Object doBuiltinTypeGeneric(PythonBuiltinClassType klass,
+                    @CachedContext(PythonLanguage.class) PythonContext ctx) {
         Object result = slot.getValue(klass);
         if (result != null) {
             return result;
         } else {
-            return slot.getValue(getCore().lookupType(klass));
+            return slot.getValue(ctx.getCore().lookupType(klass));
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/LookupInMROBaseNode.java

@@ -40,29 +40,13 @@
  */
 package com.oracle.graal.python.nodes.attributes;
 
-import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
 import com.oracle.graal.python.nodes.PNodeWithContext;
-import com.oracle.graal.python.runtime.PythonContext;
-import com.oracle.graal.python.runtime.PythonCore;
 import com.oracle.graal.python.runtime.PythonOptions;
-import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
-import com.oracle.truffle.api.TruffleLanguage.ContextReference;
 import com.oracle.truffle.api.dsl.ImportStatic;
 
 @ImportStatic(PythonOptions.class)
 public abstract class LookupInMROBaseNode extends PNodeWithContext {
-    @CompilationFinal private ContextReference<PythonContext> contextRef;
-
-    protected PythonCore getCore() {
-        if (contextRef == null) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            contextRef = lookupContextReference(PythonLanguage.class);
-        }
-        return contextRef.get().getCore();
-    }
-
     public abstract Object execute(Object klass);
 
     public static LookupInMROBaseNode create(String key) {