Allow setting __dict__ of native subclasses

Author: msimacek

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

@@ -2204,6 +2204,7 @@ Object notNumber(PythonContext context, @SuppressWarnings("unused") TruffleStrin
      * {@code wrap_sq_delitem}, {@code wrap_sq_setitem}, {@code asdf}.
      */
     @ImportStatic(PGuards.class)
+    @GenerateUncached
     public abstract static class CheckPrimitiveFunctionResultNode extends CheckFunctionResultNode {
 
         @Specialization(guards = "!isMinusOne(result)")

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

@@ -217,6 +217,7 @@ public enum NativeCAPISymbol implements NativeCExtSymbol {
     FUN_PY_TRUFFLE_INITIALIZE_STORAGE_ITEM("PyTruffle_InitializeStorageItem"),
     FUN_PY_TRUFFLE_NATIVE_TUPLE_ITEMS("PyTruffle_NativeTupleItems"),
     FUN_PY_OBJECT_GENERIC_GET_DICT("_PyObject_GenericGetDict"),
+    FUN_PY_OBJECT_GENERIC_SET_DICT("PyObject_GenericSetDict"),
     FUN_PY_OBJECT_NEW("PyTruffle_Object_New"),
     FUN_GET_THREAD_STATE_TYPE_ID("get_thread_state_typeid"),
     FUN_GET_PY_BUFFER_TYPEID("get_Py_buffer_typeid"),

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

@@ -125,7 +125,6 @@
 import com.oracle.graal.python.nodes.object.BuiltinClassProfiles.IsOtherBuiltinClassProfile;
 import com.oracle.graal.python.nodes.object.DeleteDictNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
-import com.oracle.graal.python.nodes.object.GetDictIfExistsNode;
 import com.oracle.graal.python.nodes.object.GetOrCreateDictNode;
 import com.oracle.graal.python.nodes.object.InlinedGetClassNode;
 import com.oracle.graal.python.nodes.object.IsNode;
@@ -648,7 +647,7 @@ protected static boolean isAnyBuiltinButModule(Node inliningTarget, IsOtherBuilt
 
         @Specialization(guards = {"!isAnyBuiltinButModule(inliningTarget, otherBuiltinClassProfile, selfClass)", //
                         "!isExactObject(inliningTarget, isBuiltinClassProfile, selfClass)", "isNoValue(none)"}, limit = "1")
-        Object dict(VirtualFrame frame, PythonObject self, @SuppressWarnings("unused") PNone none,
+        Object dict(VirtualFrame frame, Object self, @SuppressWarnings("unused") PNone none,
                         @Bind("this") Node inliningTarget,
                         @SuppressWarnings("unused") @Shared("otherBuiltinClassProfile") @Cached IsOtherBuiltinClassProfile otherBuiltinClassProfile,
                         @SuppressWarnings("unused") @Shared("isBuiltinClassProfile") @Cached InlineIsBuiltinClassProfile isBuiltinClassProfile,
@@ -671,7 +670,7 @@ Object dict(VirtualFrame frame, PythonObject self, @SuppressWarnings("unused") P
 
         @Specialization(guards = {"!isAnyBuiltinButModule(inliningTarget, otherBuiltinClassProfile, selfClass)", //
                         "!isExactObject(inliningTarget, isBuiltinClassProfile, selfClass)", "!isPythonModule(self)"}, limit = "1")
-        static Object dict(VirtualFrame frame, PythonObject self, PDict dict,
+        static Object dict(VirtualFrame frame, Object self, PDict dict,
                         @Bind("this") Node inliningTarget,
                         @SuppressWarnings("unused") @Shared("otherBuiltinClassProfile") @Cached IsOtherBuiltinClassProfile otherBuiltinClassProfile,
                         @SuppressWarnings("unused") @Shared("isBuiltinClassProfile") @Cached InlineIsBuiltinClassProfile isBuiltinClassProfile,
@@ -693,16 +692,6 @@ static Object dict(VirtualFrame frame, PythonObject self, PDict dict,
             return PNone.NONE;
         }
 
-        @Specialization(guards = "isNoValue(none)")
-        Object dict(PythonAbstractNativeObject self, @SuppressWarnings("unused") PNone none,
-                        @Cached GetDictIfExistsNode getDict) {
-            PDict dict = getDict.execute(self);
-            if (dict == null) {
-                raise(self, none);
-            }
-            return dict;
-        }
-
         @Specialization
         static Object dict(VirtualFrame frame, @SuppressWarnings("unused") PythonObject self, @SuppressWarnings("unused") DescriptorDeleteMarker marker,
                         @Bind("this") Node inliningTarget,

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

@@ -40,14 +40,20 @@
  */
 package com.oracle.graal.python.nodes.object;
 
+import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol.FUN_PY_OBJECT_GENERIC_SET_DICT;
+
+import com.oracle.graal.python.builtins.objects.cext.PythonAbstractNativeObject;
+import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes;
+import com.oracle.graal.python.builtins.objects.cext.capi.ExternalFunctionNodes.CheckPrimitiveFunctionResultNode;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
+import com.oracle.graal.python.builtins.objects.type.TypeNodes.IsTypeNode;
 import com.oracle.graal.python.nodes.PNodeWithContext;
+import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
-import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.library.CachedLibrary;
@@ -57,7 +63,7 @@
 
 @GenerateUncached
 public abstract class SetDictNode extends PNodeWithContext {
-    public abstract void execute(PythonObject object, PDict dict);
+    public abstract void execute(Object object, PDict dict);
 
     @Specialization
     static void doPythonClass(PythonClass object, PDict dict,
@@ -67,12 +73,28 @@ static void doPythonClass(PythonClass object, PDict dict,
         object.setDictHiddenProp(inliningTarget, dylib, hasMroShapeProfile, dict);
     }
 
-    @Fallback
+    @Specialization(guards = "!isPythonClass(object)")
     static void doPythonObjectNotClass(PythonObject object, PDict dict,
                     @Shared("dylib") @CachedLibrary(limit = "4") DynamicObjectLibrary dylib) {
         object.setDict(dylib, dict);
     }
 
+    @Specialization
+    void doNativeObject(PythonAbstractNativeObject object, PDict dict,
+                    @Cached CExtNodes.ToSulongNode objectToSulong,
+                    @Cached CExtNodes.ToSulongNode dictToSulong,
+                    @Cached CExtNodes.PCallCapiFunction callGetDictNode,
+                    @Cached CheckPrimitiveFunctionResultNode checkResult) {
+        assert !IsTypeNode.getUncached().execute(object);
+        PythonContext context = getContext();
+        Object result = callGetDictNode.call(FUN_PY_OBJECT_GENERIC_SET_DICT, objectToSulong.execute(object), dictToSulong.execute(dict), context.getNativeNull().getPtr());
+        checkResult.execute(context, FUN_PY_OBJECT_GENERIC_SET_DICT.getTsName(), result);
+    }
+
+    protected static boolean isPythonClass(Object object) {
+        return object instanceof PythonClass;
+    }
+
     public static SetDictNode getUncached() {
         return SetDictNodeGen.getUncached();
     }