Use singleContext field in MRO lookup node

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonClass.java

@@ -223,7 +223,7 @@ public void setMRO(PythonAbstractClass[] mro) {
 
     public void setMRO(PythonAbstractClass[] mro, PythonLanguage language) {
         super.setMRO(mro);
-        if (!language.singleContextAssumption.isValid()) {
+        if (!language.isSingleContext()) {
             mroShape = null;
             invalidateMroShapeSubTypes();
         }
@@ -245,7 +245,7 @@ public MroShape getMroShape() {
     public void initializeMroShape(PythonLanguage language) {
         assert mroShapeSubTypes == null;
         assert mroShape == null;
-        if (!language.singleContextAssumption.isValid()) {
+        if (!language.isSingleContext()) {
             reinitializeMroShape(language);
         }
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PNodeWithContext.java

@@ -79,4 +79,8 @@ public final PythonLanguage getLanguage() {
     public final PythonContext getContext() {
         return PythonContext.get(this);
     }
+
+    public final boolean isSingleContext() {
+        return getLanguage().isSingleContext();
+    }
 }

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

@@ -150,7 +150,7 @@ public static Object findAttr(Python3Core core, PythonBuiltinClassType klass, Ob
         return value;
     }
 
-    @Specialization(guards = {"klass == cachedKlass"}, limit = "getAttributeAccessInlineCacheMaxDepth()", assumptions = "singleContextAssumption()")
+    @Specialization(guards = {"isSingleContext()", "klass == cachedKlass"}, limit = "getAttributeAccessInlineCacheMaxDepth()")
     protected static Object lookupPBCTCached(@SuppressWarnings("unused") PythonBuiltinClassType klass,
                     @Cached("klass") @SuppressWarnings("unused") PythonBuiltinClassType cachedKlass,
                     @Cached("findAttr(getContext(), cachedKlass, key)") Object cachedValue) {
@@ -184,7 +184,8 @@ public static PythonBuiltinClassType findOwnerInMro(Python3Core core, PythonBuil
         return null;
     }
 
-    @Specialization(replaces = "lookupPBCTCached", guards = "klass == cachedKlass", limit = "getAttributeAccessInlineCacheMaxDepth()")
+    @Specialization(replaces = {"lookupPBCTCached", "lookupPBCTCachedMulti"}, guards = "klass == cachedKlass", //
+                    limit = "getAttributeAccessInlineCacheMaxDepth()")
     protected Object lookupPBCTCachedOwner(@SuppressWarnings("unused") PythonBuiltinClassType klass,
                     @Cached("klass") @SuppressWarnings("unused") PythonBuiltinClassType cachedKlass,
                     @Cached("findOwnerInMro(getContext(), cachedKlass, key)") PythonBuiltinClassType ownerKlass,
@@ -251,9 +252,9 @@ protected AttributeAssumptionPair findAttrAndAssumptionInMRO(Object klass) {
         return new AttributeAssumptionPair(attrAssumption, PNone.NO_VALUE);
     }
 
-    @Specialization(guards = {"isSameType(cachedKlass, klass)", "cachedAttrInMROInfo != null"}, //
+    @Specialization(guards = {"isSingleContext()", "isSameType(cachedKlass, klass)", "cachedAttrInMROInfo != null"}, //
                     limit = "getAttributeAccessInlineCacheMaxDepth()", //
-                    assumptions = {"cachedAttrInMROInfo.assumption", "singleContextAssumption()"})
+                    assumptions = "cachedAttrInMROInfo.assumption")
     protected static Object lookupConstantMROCached(@SuppressWarnings("unused") Object klass,
                     @Cached("klass") @SuppressWarnings("unused") Object cachedKlass,
                     @Cached("findAttrAndAssumptionInMRO(cachedKlass)") AttributeAssumptionPair cachedAttrInMROInfo) {
@@ -268,7 +269,7 @@ public MroShapeLookupResult lookupInMroShape(MroShape shape, Object klass) {
     // This specialization works well only for multi-context mode
     // Note: MroShape creation and updates are disabled in multi-context mode, see
     // PythonClass#initializeMroShape
-    @Specialization(guards = {"!singleContextAssumption().isValid()", "cachedMroShape != null", "klass.getMroShape() == cachedMroShape"}, //
+    @Specialization(guards = {"!isSingleContext()", "cachedMroShape != null", "klass.getMroShape() == cachedMroShape"}, //
                     limit = "getAttributeAccessInlineCacheMaxDepth()")
     protected Object lookupConstantMROShape(PythonClass klass,
                     @SuppressWarnings("unused") @Cached("klass.getMroShape()") MroShape cachedMroShape,
@@ -284,10 +285,10 @@ protected static ReadAttributeFromObjectNode[] create(int size) {
         return nodes;
     }
 
-    @Specialization(guards = {"isSameType(cachedKlass, klass)", "mroLength < 32"}, //
+    @Specialization(guards = {"isSingleContext()", "isSameType(cachedKlass, klass)", "mroLength < 32"}, //
                     limit = "getAttributeAccessInlineCacheMaxDepth()", //
                     replaces = "lookupConstantMROShape", //
-                    assumptions = {"lookupStable", "singleContextAssumption()"})
+                    assumptions = "lookupStable")
     @ExplodeLoop(kind = ExplodeLoop.LoopExplosionKind.FULL_UNROLL_UNTIL_RETURN)
     protected Object lookupConstantMRO(@SuppressWarnings("unused") Object klass,
                     @Cached("klass") @SuppressWarnings("unused") Object cachedKlass,