Provide a single point to notify PythonManagedClass about attribute updates

Additionally, provide a simple fast-path PE friendly check whether the TruffleBoundary
attribute update notification need to be called. Used those new methods in WriteAttributeToObjectNode.

Author: steve-s

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

@@ -209,15 +209,32 @@ private boolean computeNeedsNativeAllocation() {
     @Override
     @TruffleBoundary
     public void setAttribute(Object key, Object value) {
-        invalidateFinalAttribute(key);
         super.setAttribute(key, value);
+        onAttributeUpdate(key, value);
     }
 
-    @TruffleBoundary
-    public final void invalidateFinalAttribute(Object key) {
+    /**
+     * Fast-path check designed for PE code.
+     */
+    public final boolean canSkipOnAttributeUpdate(String key, Object value) {
+        return !methodResolutionOrder.hasAttributeInMROFinalAssumptions() &&
+                        !SpecialMethodSlot.canBeSpecial(key);
+    }
+
+    public final void onAttributeUpdate(Object key, Object value) {
+        // In compilation: use a profile and call the String key overload
         CompilerAsserts.neverPartOfCompilation();
         if (key instanceof String) {
-            methodResolutionOrder.invalidateAttributeInMROFinalAssumptions((String) key);
+            onAttributeUpdate((String) key, value);
+        }
+    }
+
+    @TruffleBoundary
+    public final void onAttributeUpdate(String key, Object value) {
+        methodResolutionOrder.invalidateAttributeInMROFinalAssumptions(key);
+        SpecialMethodSlot slot = SpecialMethodSlot.findSpecialSlot(key);
+        if (slot != null) {
+            SpecialMethodSlot.fixupSpecialMethodSlot(this, slot, value);
         }
     }
 

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

@@ -101,16 +101,6 @@ protected static boolean isAttrWritable(PythonObject self, Object key) {
         return (self.getShape().getFlags() & PythonObject.HAS_SLOTS_BUT_NO_DICT_FLAG) == 0;
     }
 
-    private static void fixupSpecialMethodSlots(BranchProfile isSpecialKey, PythonManagedClass object, String key, Object value) {
-        if (SpecialMethodSlot.canBeSpecial(key)) {
-            isSpecialKey.enter();
-            SpecialMethodSlot slot = SpecialMethodSlot.findSpecialSlot(key);
-            if (slot != null) {
-                SpecialMethodSlot.fixupSpecialMethodSlot(object, slot, value);
-            }
-        }
-    }
-
     private static String castKey(CastToJavaStringNode castNode, Object value) {
         try {
             return castNode.execute(value);
@@ -138,30 +128,37 @@ static boolean writeToDynamicStorageNoType(PythonObject object, Object key, Obje
     static boolean writeToDynamicStorageBuiltinType(PythonBuiltinClass klass, Object key, Object value,
                     @CachedLibrary("klass") @SuppressWarnings("unused") PythonObjectLibrary lib,
                     @Cached CastToJavaStringNode castToStrNode,
-                    @Cached BranchProfile isSpecialKey,
-                    @Cached BranchProfile changedShape,
+                    @Cached BranchProfile callAttrUpdate,
                     @Cached WriteAttributeToDynamicObjectNode writeAttributeToDynamicObjectNode) {
         String strKey = castKey(castToStrNode, key);
         try {
             return writeAttributeToDynamicObjectNode.execute(klass, strKey, value);
         } finally {
-            klass.invalidateFinalAttribute(strKey);
-            fixupSpecialMethodSlots(isSpecialKey, klass, strKey, value);
+            if (!klass.canSkipOnAttributeUpdate(strKey, value)) {
+                callAttrUpdate.enter();
+                klass.onAttributeUpdate(strKey, value);
+            }
         }
     }
 
+    static boolean[] createFlag() {
+        return new boolean[1];
+    }
+
     @Specialization(guards = {"!isHiddenKey(key)", "!lib.hasDict(klass)", "isAttrWritable(klass, key)"}, limit = "1")
     static boolean writeToDynamicStoragePythonClass(PythonClass klass, Object key, Object value,
                     @CachedLibrary("klass") @SuppressWarnings("unused") PythonObjectLibrary lib,
                     @Cached CastToJavaStringNode castToStrNode,
-                    @Cached BranchProfile isSpecialKey,
+                    @Cached BranchProfile callAttrUpdate,
                     @Cached WriteAttributeToDynamicObjectNode writeAttributeToDynamicObjectNode) {
         String strKey = castKey(castToStrNode, key);
         try {
             return writeAttributeToDynamicObjectNode.execute(klass, strKey, value);
         } finally {
-            klass.invalidateFinalAttribute(strKey);
-            fixupSpecialMethodSlots(isSpecialKey, klass, strKey, value);
+            if (!klass.canSkipOnAttributeUpdate(strKey, value)) {
+                callAttrUpdate.enter();
+                klass.onAttributeUpdate(strKey, value);
+            }
         }
     }
 
@@ -177,16 +174,18 @@ static boolean writeToDictNoType(PythonObject object, Object key, Object value,
     @Specialization(guards = {"!isHiddenKey(key)", "lib.hasDict(klass)"}, limit = "1")
     static boolean writeToDictBuiltinType(PythonManagedClass klass, Object key, Object value,
                     @Cached CastToJavaStringNode castToStrNode,
-                    @Cached BranchProfile isSpecialKey,
+                    @Cached BranchProfile callAttrUpdate,
                     @CachedLibrary("klass") PythonObjectLibrary lib,
                     @Cached BranchProfile updateStorage,
                     @CachedLibrary(limit = "1") HashingStorageLibrary hlib) {
         String strKey = castKey(castToStrNode, key);
         try {
             return writeToDict(lib.getDict(klass), strKey, value, updateStorage, hlib);
         } finally {
-            klass.invalidateFinalAttribute(strKey);
-            fixupSpecialMethodSlots(isSpecialKey, klass, strKey, value);
+            if (!klass.canSkipOnAttributeUpdate(strKey, value)) {
+                callAttrUpdate.enter();
+                klass.onAttributeUpdate(strKey, value);
+            }
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/MroSequenceStorage.java

@@ -71,6 +71,7 @@ public final class MroSequenceStorage extends TypedSequenceStorage {
      * assumptions will be invalidated if the mro changes.
      */
     private final Map<String, List<Assumption>> attributesInMROFinalAssumptions;
+    private boolean hasAttributesInMROFinalAssumptions;
 
     @CompilationFinal(dimensions = 1) private final PythonAbstractClass[] values;
 
@@ -228,6 +229,7 @@ public Assumption createAttributeInMROFinalAssumption(String name) {
         List<Assumption> attrAssumptions = attributesInMROFinalAssumptions.getOrDefault(name, null);
         if (attrAssumptions == null) {
             attrAssumptions = new ArrayList<>();
+            hasAttributesInMROFinalAssumptions = true;
             attributesInMROFinalAssumptions.put(name, attrAssumptions);
         }
 
@@ -241,6 +243,7 @@ public void addAttributeInMROFinalAssumption(String name, Assumption assumption)
         List<Assumption> attrAssumptions = attributesInMROFinalAssumptions.getOrDefault(name, null);
         if (attrAssumptions == null) {
             attrAssumptions = new ArrayList<>();
+            hasAttributesInMROFinalAssumptions = true;
             attributesInMROFinalAssumptions.put(name, attrAssumptions);
         }
 
@@ -301,4 +304,7 @@ public Object[] getCopyOfInternalArray() {
         return getInternalArray();
     }
 
+    public final boolean hasAttributeInMROFinalAssumptions() {
+        return hasAttributesInMROFinalAssumptions;
+    }
 }