Move 'attributeInMroFinal' assumptions to 'MroSequenceStorage'.

Author: fangerer

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

@@ -383,7 +383,7 @@ int PyType_Ready(PyTypeObject* cls) {
     }
 
     /* initialize mro */
-    cls->tp_mro = UPCALL_CEXT_O(_jls_PyTruffle_Compute_Mro, cls);
+    cls->tp_mro = UPCALL_CEXT_O(_jls_PyTruffle_Compute_Mro, cls, polyglot_from_string(cls->tp_name, SRC_CS));
 
     /* Inherit special flags from dominant base */
     if (cls->tp_base != NULL)

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

@@ -118,11 +118,11 @@
 import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.builtins.objects.traceback.PTraceback;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
-import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
 import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
-import com.oracle.graal.python.builtins.objects.type.PythonManagedClass;
+import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
 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.TypeNodes;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetTypeFlagsNode;
 import com.oracle.graal.python.nodes.PGuards;
@@ -2312,14 +2312,15 @@ int add(Object self, @SuppressWarnings("unused") Object o) {
 
     }
 
-    @Builtin(name = "PyTruffle_Compute_Mro", fixedNumOfPositionalArgs = 1)
+    @Builtin(name = "PyTruffle_Compute_Mro", fixedNumOfPositionalArgs = 2)
     @GenerateNodeFactory
-    public abstract static class PyTruffle_Compute_Mro extends PythonUnaryBuiltinNode {
+    @TypeSystemReference(PythonArithmeticTypes.class)
+    public abstract static class PyTruffle_Compute_Mro extends PythonBinaryBuiltinNode {
 
         @Specialization
-        Object doIt(PythonNativeObject self) {
+        Object doIt(PythonNativeObject self, String className) {
             PythonAbstractClass[] doSlowPath = TypeNodes.ComputeMroNode.doSlowPath(PythonNativeClass.cast(self));
-            return factory().createTuple(new MroSequenceStorage(doSlowPath));
+            return factory().createTuple(new MroSequenceStorage(className, doSlowPath));
         }
     }
 }

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

@@ -42,6 +42,7 @@
 
 import java.util.ArrayList;
 
+import com.oracle.graal.python.runtime.sequence.storage.MroSequenceStorage;
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.object.DynamicObject;
@@ -143,7 +144,7 @@ public DynamicObject getStore() {
         return store;
     }
 
-    public static class FastDictStorage extends DynamicObjectStorage {
+    public static final class FastDictStorage extends DynamicObjectStorage {
         public FastDictStorage() {
         }
 
@@ -159,7 +160,7 @@ public HashingStorage copy(Equivalence eq) {
         }
     }
 
-    public static class PythonObjectDictStorage extends DynamicObjectStorage {
+    public static final class PythonObjectDictStorage extends DynamicObjectStorage {
         private final Assumption dictUnsetOrSameAsStorage;
 
         public PythonObjectDictStorage(DynamicObject store) {
@@ -179,11 +180,40 @@ public Assumption getDictUnsetOrSameAsStorage() {
         @TruffleBoundary
         public HashingStorage copy(Equivalence eq) {
             assert eq == HashingStorage.DEFAULT_EQIVALENCE;
-            return new PythonObjectDictStorage(getStore().copy(getStore().getShape()));
+            return new FastDictStorage(getStore().copy(getStore().getShape()));
+        }
+    }
+
+    /**
+     * Special storage that is used in the type dict (i.e. {@code tp_dict}) of native types. Writing
+     * to this storage will cause the appropriate <it>attribute final</it> assumptions to be
+     * invalidated. Therefore, this storage links to the {@link MroSequenceStorage} of the type.
+     */
+    public static final class PythonNativeObjectDictStorage extends DynamicObjectStorage {
+        private final MroSequenceStorage mro;
+
+        public PythonNativeObjectDictStorage(DynamicObject store, MroSequenceStorage mro) {
+            super(store);
+            this.mro = mro;
+        }
+
+        public MroSequenceStorage getMro() {
+            return mro;
+        }
+
+        public void invalidateAttributeInMROFinalAssumptions(String name) {
+            mro.invalidateAttributeInMROFinalAssumptions(name);
+        }
+
+        @Override
+        @TruffleBoundary
+        public HashingStorage copy(Equivalence eq) {
+            assert eq == HashingStorage.DEFAULT_EQIVALENCE;
+            return new FastDictStorage(getStore().copy(getStore().getShape()));
         }
     }
 
-    public static class PythonObjectHybridDictStorage extends DynamicObjectStorage {
+    public static final class PythonObjectHybridDictStorage extends DynamicObjectStorage {
         private final EconomicMapStorage nonAttributesStorage;
 
         public PythonObjectHybridDictStorage(PythonObjectDictStorage storage) {