reuse the attr stable in MRO assumption for delete attribute operations

Author: cosminbasca

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

@@ -127,7 +127,7 @@ public Assumption createAttributeInMROFinalAssumption(Object name) {
     }
 
     @TruffleBoundary
-    public void setAttributeInMROFinalAssumption(Object name, Assumption assumption) {
+    public void addAttributeInMROFinalAssumption(Object name, Assumption assumption) {
         List<Assumption> attrAssumptions = attributesInMROFinalAssumptions.getOrDefault(name, null);
         if (attrAssumptions == null) {
             attrAssumptions = new ArrayList<>();

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

@@ -63,13 +63,24 @@ public static DeleteAttributeNode create(PNode object, PNode key) {
     public abstract Object execute(Object object, Object key);
 
     @Specialization
+    protected Object doClass(PythonClass cls, Object key,
+                    @Cached("createIdentityProfile()") ValueProfile setAttributeProfile,
+                    @Cached("create(__DELATTR__)") LookupAttributeInMRONode delAttributeLookup,
+                    @Cached("create()") CallBinaryMethodNode callDelAttribute) {
+        cls.lookupChanged();
+        cls.invalidateAttributeInMROFinalAssumptions(key);
+        Object descr = setAttributeProfile.profile(delAttributeLookup.execute(cls));
+        return callDelAttribute.executeObject(descr, cls, key);
+    }
+
+    @Specialization(guards = "!isClass(object)")
     protected Object doIt(Object object, Object key,
                     @Cached("createIdentityProfile()") ValueProfile setAttributeProfile,
                     @Cached("create()") GetClassNode getClassNode,
                     @Cached("create(__DELATTR__)") LookupAttributeInMRONode delAttributeLookup,
-                    @Cached("create()") CallBinaryMethodNode callDelAttr) {
+                    @Cached("create()") CallBinaryMethodNode callDelAttribute) {
         PythonClass type = getClassNode.execute(object);
         Object descr = setAttributeProfile.profile(delAttributeLookup.execute(type));
-        return callDelAttr.executeObject(descr, object, key);
+        return callDelAttribute.executeObject(descr, object, key);
     }
 }

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

@@ -48,7 +48,6 @@
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
-import com.oracle.truffle.api.profiles.ConditionProfile;
 
 public abstract class LookupAttributeInMRONode extends PBaseNode {
 
@@ -118,10 +117,13 @@ protected PythonClassAssumptionPair findAttrClassAndAssumptionInMRO(PythonClass
         Assumption attrAssumption = null;
         for (int i = 0; i < mro.length; i++) {
             PythonClass cls = mro[i];
-            if (attrAssumption == null) {
-                attrAssumption = cls.createAttributeInMROFinalAssumption(key);
-            } else {
-                cls.setAttributeInMROFinalAssumption(key, attrAssumption);
+            if (i > 0) {
+                assert cls != klass : "MRO chain is incorrect: '" + klass + "' was found at position " + i;
+                if (attrAssumption == null) {
+                    attrAssumption = cls.createAttributeInMROFinalAssumption(key);
+                } else {
+                    cls.addAttributeInMROFinalAssumption(key, attrAssumption);
+                }
             }
 
             if (cls.getStorage().containsKey(key)) {
@@ -131,20 +133,14 @@ protected PythonClassAssumptionPair findAttrClassAndAssumptionInMRO(PythonClass
         return new PythonClassAssumptionPair(null, attrAssumption);
     }
 
-    @Specialization(guards = {"klass == cachedKlass", "cachedAttributeClassAssumptionPair.cls != null"}, limit = "5", assumptions = {"lookupStable",
-                    "cachedAttributeClassAssumptionPair.assumption"}, rewriteOn = IllegalStateException.class)
+    @Specialization(guards = {"klass == cachedKlass", "cachedAttributeStableInMROInfo.cls != null"}, limit = "5", assumptions = {"lookupStable",
+                    "cachedAttributeStableInMROInfo.assumption"})
     protected Object lookupConstantMROCached(@SuppressWarnings("unused") PythonClass klass,
                     @Cached("klass") @SuppressWarnings("unused") PythonClass cachedKlass,
                     @Cached("cachedKlass.getLookupStableAssumption()") @SuppressWarnings("unused") Assumption lookupStable,
                     @Cached("create()") ReadAttributeFromObjectNode readAttrNode,
-                    @Cached("findAttrClassAndAssumptionInMRO(cachedKlass)") @SuppressWarnings("unused") PythonClassAssumptionPair cachedAttributeClassAssumptionPair,
-                    @Cached("createBinaryProfile()") ConditionProfile attributeDeletedProfile) {
-        Object value = readAttrNode.execute(cachedAttributeClassAssumptionPair.cls, key);
-        if (attributeDeletedProfile.profile(value == PNone.NO_VALUE)) {
-            // in case the attribute was deleted
-            throw new IllegalStateException();
-        }
-        return value;
+                    @Cached("findAttrClassAndAssumptionInMRO(cachedKlass)") @SuppressWarnings("unused") PythonClassAssumptionPair cachedAttributeStableInMROInfo) {
+        return readAttrNode.execute(cachedAttributeStableInMROInfo.cls, key);
     }
 
     protected ReadAttributeFromObjectNode[] create(int size) {

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

@@ -51,6 +51,7 @@
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.profiles.ValueProfile;
 
 @NodeChildren({@NodeChild(value = "object", type = PNode.class), @NodeChild(value = "key", type = PNode.class), @NodeChild(value = "rhs", type = PNode.class)})
@@ -92,7 +93,11 @@ public PNode getPrimaryNode() {
     protected Object doClass(PythonClass cls, Object key, Object value,
                     @Cached("createIdentityProfile()") ValueProfile setAttributeProfile,
                     @Cached("create(__SETATTR__)") LookupAttributeInMRONode setAttributeLookup,
-                    @Cached("create()") CallTernaryMethodNode callSetAttribute) {
+                    @Cached("create()") CallTernaryMethodNode callSetAttribute,
+                    @Cached("createBinaryProfile()") ConditionProfile isAddingAttributeProfile) {
+        if (isAddingAttributeProfile.profile(!cls.getStorage().containsKey(key))) {
+            cls.lookupChanged();
+        }
         cls.invalidateAttributeInMROFinalAssumptions(key);
         Object descr = setAttributeProfile.profile(setAttributeLookup.execute(cls));
         return callSetAttribute.execute(descr, cls, key, value);