PIC for builtin class types when we're in multi-context case

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/PythonObject.java

@@ -42,6 +42,7 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectFactory;
+import com.oracle.truffle.api.object.ObjectType;
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.object.dsl.Layout;
 import com.oracle.truffle.api.object.dsl.Nullable;
@@ -158,6 +159,8 @@ protected static interface PythonObjectLayout {
 
         LazyPythonClass getLazyPythonClass(DynamicObjectFactory factory);
 
+        LazyPythonClass getLazyPythonClass(ObjectType objectType);
+
         LazyPythonClass getLazyPythonClass(DynamicObject object);
 
         void setLazyPythonClass(DynamicObject object, LazyPythonClass value);
@@ -166,4 +169,8 @@ protected static interface PythonObjectLayout {
     public static Shape freshShape(LazyPythonClass klass) {
         return PythonObjectLayoutImpl.INSTANCE.createPythonObjectShape(klass).getShape();
     }
+
+    public static LazyPythonClass getLazyPythonClass(ObjectType type) {
+        return PythonObjectLayoutImpl.INSTANCE.getLazyPythonClass(type);
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/object/GetLazyClassNode.java

@@ -158,15 +158,27 @@ protected static LazyPythonClass getIt(@SuppressWarnings("unused") PythonNativeV
 
     // if object is constant here, storage will also be constant, so the shape
     // lookup is the only thing we need.
-    @Specialization(guards = "object.getStorage().getShape() == cachedShape", assumptions = {"singleContextAssumption"}, limit = "1")
-    protected static LazyPythonClass getPythonClassCached(@SuppressWarnings("unused") PythonObject object,
+    @Specialization(guards = "object.getStorage().getShape() == cachedShape", assumptions = {"singleContextAssumption"}, limit = "4")
+    protected static LazyPythonClass getPythonClassCachedSingle(@SuppressWarnings("unused") PythonObject object,
                     @SuppressWarnings("unused") @Cached("object.getStorage().getShape()") Shape cachedShape,
                     @SuppressWarnings("unused") @Cached("singleContextAssumption()") Assumption singleContextAssumption,
                     @Cached("object.getLazyPythonClass()") LazyPythonClass klass) {
         return klass;
     }
 
-    @Specialization(replaces = "getPythonClassCached")
+    protected static boolean isBuiltinType(Shape shape) {
+        return PythonObject.getLazyPythonClass(shape.getObjectType()) instanceof PythonBuiltinClassType;
+    }
+
+    // we can at least cache builtin types in the multi-context case
+    @Specialization(guards = {"object.getStorage().getShape() == cachedShape", "isBuiltinType(cachedShape)"}, limit = "4")
+    protected static LazyPythonClass getPythonClassCached(@SuppressWarnings("unused") PythonObject object,
+                    @SuppressWarnings("unused") @Cached("object.getStorage().getShape()") Shape cachedShape,
+                    @Cached("object.getLazyPythonClass()") LazyPythonClass klass) {
+        return klass;
+    }
+
+    @Specialization(replaces = {"getPythonClassCached", "getPythonClassCachedSingle"})
     protected static LazyPythonClass getPythonClassGeneric(PythonObject object) {
         return object.getLazyPythonClass();
     }