Do subclass updates for native clasess too

Author: msimacek

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

@@ -30,12 +30,16 @@
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.graal.python.builtins.objects.cext.PythonAbstractNativeObject;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PCallCapiFunction;
 import com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol;
 import com.oracle.graal.python.builtins.objects.cext.capi.PythonClassNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitionsFactory.PythonToNativeNodeGen;
+import com.oracle.graal.python.builtins.objects.common.HashingStorage;
+import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes;
 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.referencetype.PReferenceType;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.ComputeMroNode;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetSubclassesAsArrayNode;
@@ -47,6 +51,7 @@
 import com.oracle.graal.python.runtime.object.PFactory;
 import com.oracle.graal.python.runtime.sequence.storage.MroSequenceStorage;
 import com.oracle.truffle.api.CompilerAsserts;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.nodes.Node;
@@ -209,11 +214,7 @@ public void setAttribute(TruffleString key, Object value) {
 
     @TruffleBoundary
     public void onAttributeUpdate(TruffleString key, Object value) {
-        for (PythonAbstractClass subclass : GetSubclassesAsArrayNode.executeUncached(this)) {
-            if (subclass instanceof PythonManagedClass managedClass) {
-                managedClass.onAttributeUpdate(key, value);
-            }
-        }
+        callOnAttributeUpdateOnSubclasses(subClasses, key, value);
         methodResolutionOrder.invalidateFinalAttributeAssumption(key);
         if (TpSlots.canBeSpecialMethod(key, CodePointLengthNode.getUncached(), CodePointAtIndexNode.getUncached())) {
             if (this.tpSlots != null) {
@@ -224,6 +225,36 @@ public void onAttributeUpdate(TruffleString key, Object value) {
         }
     }
 
+    @TruffleBoundary
+    public static void onAttributeUpdateNative(PythonAbstractNativeObject nativeClass, TruffleString key, Object value) {
+        assert TypeNodes.IsTypeNode.executeUncached(nativeClass);
+        callOnAttributeUpdateOnSubclasses(GetSubclassesNode.executeUncached(nativeClass), key, value);
+        TypeNodes.GetMroStorageNode.executeUncached(nativeClass).invalidateFinalAttributeAssumption(key);
+        if (TpSlots.canBeSpecialMethod(key, CodePointLengthNode.getUncached(), CodePointAtIndexNode.getUncached())) {
+            TpSlots.updateSlot(nativeClass, key);
+        }
+    }
+
+    private static void callOnAttributeUpdateOnSubclasses(PDict subClasses, TruffleString key, Object value) {
+        if (subClasses != null) {
+            HashingStorage dictStorage = subClasses.getDictStorage();
+            HashingStorageNodes.HashingStorageIterator it = HashingStorageNodes.HashingStorageGetIterator.executeUncached(dictStorage);
+            while (HashingStorageNodes.HashingStorageIteratorNext.executeUncached(dictStorage, it)) {
+                PReferenceType ref = (PReferenceType) HashingStorageNodes.HashingStorageIteratorValue.executeUncached(dictStorage, it);
+                Object subclass = ref.getObject();
+                if (subclass != null) {
+                    if (subclass instanceof PythonManagedClass managedClass) {
+                        managedClass.onAttributeUpdate(key, value);
+                    } else if (subclass instanceof PythonAbstractNativeObject nativeClass) {
+                        onAttributeUpdateNative(nativeClass, key, value);
+                    } else {
+                        throw CompilerDirectives.shouldNotReachHere("Unexpected subclass type");
+                    }
+                }
+            }
+        }
+    }
+
     /**
      * This method supports initialization and solves boot-order problems and should not normally be
      * used.

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

@@ -57,7 +57,6 @@
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.builtins.objects.type.PythonManagedClass;
-import com.oracle.graal.python.builtins.objects.type.TpSlots;
 import com.oracle.graal.python.builtins.objects.type.TypeFlags;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.IsTypeNode;
 import com.oracle.graal.python.nodes.ErrorMessages;
@@ -239,11 +238,8 @@ static boolean writeNativeObjectOrClass(PythonAbstractNativeObject object, Truff
                     @Cached CStructAccess.ReadObjectNode getNativeDict,
                     @Exclusive @Cached HashingStorageSetItem setHashingStorageItem,
                     @Exclusive @Cached InlinedBranchProfile updateStorage,
-                    @Exclusive @Cached InlinedBranchProfile canBeSpecialSlot,
                     @Cached IsTypeNode isTypeNode,
-                    @Exclusive @Cached PRaiseNode raiseNode,
-                    @Cached TruffleString.CodePointLengthNode codePointLengthNode,
-                    @Cached TruffleString.CodePointAtIndexNode codePointAtIndexNode) {
+                    @Exclusive @Cached PRaiseNode raiseNode) {
         boolean isType = isTypeProfile.profile(inliningTarget, isTypeNode.execute(inliningTarget, object));
         try {
             Object dict;
@@ -269,13 +265,12 @@ static boolean writeNativeObjectOrClass(PythonAbstractNativeObject object, Truff
             }
             throw raiseNode.raise(inliningTarget, PythonBuiltinClassType.AttributeError, ErrorMessages.OBJ_P_HAS_NO_ATTR_S, object, key);
         } finally {
-            if (isType && TpSlots.canBeSpecialMethod(key, codePointLengthNode, codePointAtIndexNode)) {
-                canBeSpecialSlot.enter(inliningTarget);
+            if (isType) {
                 // In theory, we should do this only in type's default tp_setattr(o) slots,
                 // one could probably bypass that by using different metaclass and
                 // overriding tp_setattr and delegate to object's tp_setattr that does not
                 // have this hook
-                TpSlots.updateSlot(object, key);
+                PythonManagedClass.onAttributeUpdateNative(object, key, value);
             }
         }
     }