Fix: provide unique instance shape per native class in single context

Author: fangerer

graalpython/com.oracle.graal.python.cext/src/typeobject.c

@@ -408,6 +408,7 @@ static void add_method_or_slot(PyTypeObject* cls, PyObject* type_dict, char* nam
 
 UPCALL_ID(PyTruffle_Get_Inherited_Native_Slots);
 UPCALL_ID(PyTruffle_Compute_Mro);
+UPCALL_ID(PyTruffle_NewTypeDict);
 int PyType_Ready(PyTypeObject* cls) {
 #define RETURN_ERROR(__type__) \
     do { \
@@ -492,7 +493,7 @@ int PyType_Ready(PyTypeObject* cls) {
     /* Initialize tp_dict */
     PyObject* dict = cls->tp_dict;
     if (dict == NULL) {
-        dict = PyDict_New();
+        dict = UPCALL_CEXT_O(_jls_PyTruffle_NewTypeDict, native_type_to_java(cls));
         if (dict == NULL) {
         	RETURN_ERROR(cls);
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -32,6 +32,7 @@
 import java.util.concurrent.Semaphore;
 import java.util.logging.Level;
 
+import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
 import org.graalvm.options.OptionDescriptors;
 import org.graalvm.options.OptionKey;
 import org.graalvm.options.OptionValues;
@@ -811,7 +812,7 @@ public Shape getEmptyShape() {
         return emptyShape;
     }
 
-    public Shape getShapeForClass(PythonManagedClass klass) {
+    public Shape getShapeForClass(PythonAbstractClass klass) {
         if (singleContextAssumption.isValid()) {
             return Shape.newBuilder(getEmptyShape()).addConstantProperty(HiddenAttributes.CLASS, klass, 0).build();
         } else {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PythonCextBuiltins.java

@@ -148,9 +148,11 @@
 import com.oracle.graal.python.builtins.objects.cext.common.CExtCommonNodes.UnicodeFromWcharNode;
 import com.oracle.graal.python.builtins.objects.cext.common.CExtCommonNodesFactory.ConvertPIntToPrimitiveNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.common.CExtContext;
+import com.oracle.graal.python.builtins.objects.cext.common.CExtContext.Store;
 import com.oracle.graal.python.builtins.objects.cext.common.CExtParseArgumentsNode;
 import com.oracle.graal.python.builtins.objects.cext.common.CExtParseArgumentsNode.SplitFormatStringNode;
 import com.oracle.graal.python.builtins.objects.code.PCode;
+import com.oracle.graal.python.builtins.objects.common.DynamicObjectStorage;
 import com.oracle.graal.python.builtins.objects.common.HashingCollectionNodes;
 import com.oracle.graal.python.builtins.objects.common.HashingStorage;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageLibrary;
@@ -290,6 +292,7 @@
 import com.oracle.truffle.api.nodes.ControlFlowException;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
+import com.oracle.truffle.api.object.DynamicObjectLibrary;
 import com.oracle.truffle.api.object.HiddenKey;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
@@ -2324,6 +2327,21 @@ Object doIt(Object self, String className) {
         }
     }
 
+    @Builtin(name = "PyTruffle_NewTypeDict")
+    @GenerateNodeFactory
+    @TypeSystemReference(PythonTypes.class)
+    public abstract static class PyTruffleNewTypeDict extends PythonUnaryBuiltinNode {
+
+        @Specialization
+        @TruffleBoundary
+        static PDict doGeneric(PythonNativeClass nativeClass) {
+            PythonLanguage language = PythonLanguage.getCurrent();
+            Store nativeTypeStore = new Store(language.getEmptyShape());
+            DynamicObjectLibrary.getUncached().put(nativeTypeStore, PythonNativeClass.INSTANCESHAPE, language.getShapeForClass(nativeClass));
+            return PythonObjectFactory.getUncached().createDict(new DynamicObjectStorage(nativeTypeStore));
+        }
+    }
+
     @Builtin(name = "PyTruffle_Type_Modified", minNumOfPositionalArgs = 3)
     @GenerateNodeFactory
     @TypeSystemReference(PythonTypes.class)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonNativeClass.java

@@ -42,6 +42,7 @@
 
 import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
 import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.object.HiddenKey;
 
 /**
  * A simple wrapper around types objects created through the Python C API that can be cast to
@@ -51,6 +52,8 @@
  */
 public interface PythonNativeClass extends PythonAbstractClass {
 
+    public static final HiddenKey INSTANCESHAPE = new HiddenKey("instanceshape");
+
     TruffleObject getPtr();
 
     default String getName() {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/common/CExtContext.java

@@ -150,7 +150,7 @@ public static boolean isMethFastcallWithKeywords(int flags) {
         return (flags & METH_FASTCALL) != 0 && (flags & METH_KEYWORDS) != 0;
     }
 
-    protected static final class Store extends DynamicObject {
+    public static final class Store extends DynamicObject {
         public Store(Shape shape) {
             super(shape);
         }

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

@@ -90,6 +90,7 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol;
 import com.oracle.graal.python.builtins.objects.cext.capi.NativeMember;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyDef;
+import com.oracle.graal.python.builtins.objects.common.DynamicObjectStorage;
 import com.oracle.graal.python.builtins.objects.common.HashingStorage;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageLibrary;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageLibrary.HashingStorageIterator;
@@ -156,6 +157,7 @@
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.nodes.ControlFlowException;
 import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.object.DynamicObjectLibrary;
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
@@ -1511,9 +1513,22 @@ static Shape doManagedClass(PythonManagedClass clazz) {
         }
 
         @Specialization
-        static Shape doNativeClass(@SuppressWarnings("unused") PythonAbstractNativeObject clazz,
-                        @Shared("lang") @CachedLanguage PythonLanguage lang) {
-            return lang.getEmptyShape();
+        static Shape doNativeClass(PythonAbstractNativeObject clazz,
+                        @Cached GetTypeMemberNode getTpDictNode,
+                        @CachedLibrary(limit = "1") DynamicObjectLibrary lib) {
+            Object tpDictObj = getTpDictNode.execute(clazz, NativeMember.TP_DICT);
+            if (tpDictObj instanceof PDict) {
+                HashingStorage dictStorage = ((PDict) tpDictObj).getDictStorage();
+                if (dictStorage instanceof DynamicObjectStorage) {
+                    Object instanceShapeObj = lib.getOrDefault(((DynamicObjectStorage) dictStorage).getStore(), PythonNativeClass.INSTANCESHAPE, PNone.NO_VALUE);
+                    if (instanceShapeObj != PNone.NO_VALUE) {
+                        return (Shape) instanceShapeObj;
+                    }
+                    throw CompilerDirectives.shouldNotReachHere("instanceshape object is not a shape");
+                }
+            }
+            // TODO(fa): track unique shape per native class in language?
+            throw CompilerDirectives.shouldNotReachHere("custom dicts for native classes are unsupported");
         }
 
         @Specialization(guards = {"!isManagedClass(clazz)", "!isPythonBuiltinClassType(clazz)"})