[GR-13147] Test and fix writing HiddenKeys to objects with a __dict__

PullRequest: graalpython/334

Author: ansalond

graalpython/com.oracle.graal.python.test/src/tests/test_assign.py

@@ -85,3 +85,18 @@ def test_destructuring():
     # TODO not supported yet
 #     a, b, c = "\U0001d49c\U0001d49e\U0001d4b5"
 #     assert a == '𝒜' and b == '𝒞' and c == '𝒵'
+
+
+def test_assigning_hidden_keys():
+    class A():
+        def __init__(self):
+            self.__dict__["xyz"] = 1
+
+    ary = [A(), A(), A(), A(), A(), A()]
+    for a in ary:
+        a.foo = 12
+
+    for a in ary:
+        id(a) # id is stored in a HiddenKey
+
+    return

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

@@ -113,8 +113,8 @@ protected Object readFromDictCached(PythonObject object, Object key,
     }
 
     @Specialization(guards = {
-                    "!isDictUnsetOrSameAsStorage(object)",
-                    "!isHiddenKey(key)"
+                    "!isHiddenKey(key)",
+                    "!isDictUnsetOrSameAsStorage(object)"
     }, replaces = "readFromDictCached")
     protected Object readFromDict(PythonObject object, Object key,
                     @Cached("create()") HashingStorageNodes.GetItemNode getItemNode) {
@@ -131,7 +131,10 @@ protected Node createReadMessageNode() {
         return Message.READ.createNode();
     }
 
-    @Specialization(guards = "!isPythonObject(object)")
+    @Specialization(guards = {
+                    "!isHiddenKey(key)",
+                    "!isPythonObject(object)"
+    })
     protected Object readNative(PythonNativeObject object, Object key,
                     @Cached("create()") GetObjectDictNode getNativeDict,
                     @Cached("create()") HashingStorageNodes.GetItemNode getItemNode) {

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

@@ -77,8 +77,8 @@ public static WriteAttributeToObjectNode create() {
         return WriteAttributeToObjectNodeGen.create();
     }
 
-    protected boolean isAttrWritable(PythonObject self) {
-        if (self instanceof PythonClass || self instanceof PFunction || self instanceof PMethod || self instanceof PythonModule || self instanceof PBaseException) {
+    protected boolean isAttrWritable(PythonObject self, Object key) {
+        if (isHiddenKey(key) || self instanceof PythonClass || self instanceof PFunction || self instanceof PMethod || self instanceof PythonModule || self instanceof PBaseException) {
             return true;
         }
         return !exactBuiltinInstanceProfile.profileIsAnyBuiltinObject(self);
@@ -95,7 +95,7 @@ private void handlePythonClass(PythonObject object, Object key) {
     // write to the DynamicObject
     @Specialization(guards = {
                     "object == cachedObject",
-                    "isAttrWritable(object) || isHiddenKey(key)"
+                    "isAttrWritable(object, key)"
     }, assumptions = {
                     "singleContextAssumption",
                     "dictUnsetOrSameAsStorageAssumption"
@@ -110,8 +110,8 @@ protected boolean writeToDynamicStorageCached(PythonObject object, Object key, O
     }
 
     @Specialization(guards = {
-                    "isAttrWritable(object) || isHiddenKey(key)",
-                    "isDictUnsetOrSameAsStorage(object)"
+                    "isAttrWritable(object, key)",
+                    "isHiddenKey(key) || isDictUnsetOrSameAsStorage(object)"
     }, replaces = "writeToDynamicStorageCached")
     protected boolean writeToDynamicStorage(PythonObject object, Object key, Object value,
                     @Cached("create()") WriteAttributeToDynamicObjectNode writeAttributeToDynamicObjectNode) {
@@ -122,7 +122,8 @@ protected boolean writeToDynamicStorage(PythonObject object, Object key, Object
     // write to the dict
     @Specialization(guards = {
                     "object == cachedObject",
-                    "!dictUnsetOrSameAsStorageAssumption.isValid()"
+                    "!isHiddenKey(key)",
+                    "!dictUnsetOrSameAsStorageAssumption.isValid()",
     }, assumptions = {
                     "singleContextAssumption"
     })
@@ -144,6 +145,7 @@ protected boolean writeToDictCached(PythonObject object, Object key, Object valu
     }
 
     @Specialization(guards = {
+                    "!isHiddenKey(key)",
                     "!isDictUnsetOrSameAsStorage(object)"
     }, replaces = "writeToDictCached")
     protected boolean writeToDict(PythonObject object, Object key, Object value,
@@ -160,7 +162,10 @@ protected boolean writeToDict(PythonObject object, Object key, Object value,
         return true;
     }
 
-    @Specialization(guards = "!isPythonObject(object)")
+    @Specialization(guards = {
+                    "!isHiddenKey(key)",
+                    "!isPythonObject(object)"
+    })
     protected boolean readNative(PythonNativeObject object, Object key, Object value,
                     @Cached("create()") GetObjectDictNode getNativeDict,
                     @Cached("create()") HashingCollectionNodes.SetItemNode setItemNode) {