Use PythonLanaguage#isSingleContext in MRO slots lookup

Author: steve-s

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

@@ -96,16 +96,16 @@ static Object doBuiltinTypeCached(@SuppressWarnings("unused") PythonBuiltinClass
 
         // Single-context
 
-        @Specialization(guards = "klass == cachedKlass", //
-                        assumptions = {"singleContextAssumption()", "cachedKlass.getSlotsFinalAssumption()"}, //
+        @Specialization(guards = {"isSingleContext()", "klass == cachedKlass"}, //
+                        assumptions = "cachedKlass.getSlotsFinalAssumption()", //
                         limit = "getAttributeAccessInlineCacheMaxDepth()")
         static Object doSlotCachedSingleCtx(@SuppressWarnings("unused") PythonClass klass,
                         @SuppressWarnings("unused") @Cached(value = "klass", weak = true) PythonClass cachedKlass,
                         @Cached(value = "slot.getValue(klass)", weak = true) Object result) {
             return result;
         }
 
-        @Specialization(guards = "klass == cachedKlass", assumptions = {"singleContextAssumption()"}, limit = "getAttributeAccessInlineCacheMaxDepth()")
+        @Specialization(guards = {"isSingleContext()", "klass == cachedKlass"}, limit = "getAttributeAccessInlineCacheMaxDepth()")
         static Object doBuiltinCachedSingleCtx(@SuppressWarnings("unused") PythonBuiltinClass klass,
                         @SuppressWarnings("unused") @Cached("klass") PythonBuiltinClass cachedKlass,
                         @Cached("slot.getValue(klass)") Object result) {
@@ -115,8 +115,8 @@ static Object doBuiltinCachedSingleCtx(@SuppressWarnings("unused") PythonBuiltin
         // PythonBuiltinClassType: if the value of the slot is not node factory or None, we must
         // read
         // the slot from the resolved builtin class
-        @Specialization(guards = {"klassType == cachedKlassType", "slot.getValue(cachedKlassType) == null"}, //
-                        assumptions = {"singleContextAssumption()"}, limit = "getAttributeAccessInlineCacheMaxDepth()")
+        @Specialization(guards = {"isSingleContext()", "klassType == cachedKlassType", "slot.getValue(cachedKlassType) == null"}, //
+                        limit = "getAttributeAccessInlineCacheMaxDepth()")
         static Object doBuiltinTypeCachedSingleCtx(@SuppressWarnings("unused") PythonBuiltinClassType klassType,
                         @SuppressWarnings("unused") @Cached("klassType") PythonBuiltinClassType cachedKlassType,
                         @Cached("slot.getValue(getContext().lookupType(cachedKlassType))") Object value) {
@@ -125,7 +125,8 @@ static Object doBuiltinTypeCachedSingleCtx(@SuppressWarnings("unused") PythonBui
 
         // Multi-context:
 
-        @Specialization(replaces = "doSlotCachedSingleCtx", guards = {"slot.getValue(klass) == result", "isCacheable(result)"}, limit = "getAttributeAccessInlineCacheMaxDepth()")
+        @Specialization(replaces = "doSlotCachedSingleCtx", guards = {"slot.getValue(klass) == result", "isCacheable(result)"}, //
+                        limit = "getAttributeAccessInlineCacheMaxDepth()")
         static Object doSlotCachedMultiCtx(@SuppressWarnings("unused") PythonClass klass,
                         @Cached("slot.getValue(klass)") Object result) {
             // in multi-context we can still cache primitives and BuiltinMethodDescriptor instances