Read/WriteAttributeFromDynamicObjectNode: rely on DynamicObjectLibrary caching

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/getsetdescriptor/HiddenPythonKey.java

@@ -45,7 +45,7 @@
 /**
  * Use instead of {@link HiddenKey} which does comparison based on object identity.
  */
-public class HiddenPythonKey {
+public final class HiddenPythonKey {
     private final String name;
 
     public HiddenPythonKey(String name) {

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

@@ -46,6 +46,7 @@
 import com.oracle.graal.python.nodes.util.CannotCastException;
 import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
 import com.oracle.graal.python.runtime.PythonOptions;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.nodes.NodeCost;
 import com.oracle.truffle.api.object.HiddenKey;
@@ -58,7 +59,7 @@ protected static Object attrKey(Object key, CastToJavaStringNode castNode) {
         try {
             return castNode.execute(key);
         } catch (CannotCastException e) {
-            return key;
+            throw CompilerDirectives.shouldNotReachHere();
         }
     }
 

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

@@ -55,6 +55,7 @@
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectLibrary;
+import com.oracle.truffle.api.object.HiddenKey;
 import com.oracle.truffle.api.object.Location;
 import com.oracle.truffle.api.object.Shape;
 
@@ -72,6 +73,8 @@ public static ReadAttributeFromDynamicObjectNode getUncached() {
 
     public abstract Object execute(Object object, Object key);
 
+    public abstract Object execute(Object object, HiddenKey key);
+
     protected static Object getAttribute(DynamicObject object, String key) {
         return DynamicObjectLibrary.getUncached().getOrDefault(object, key, PNone.NO_VALUE);
     }
@@ -101,14 +104,19 @@ protected Object readFinalAttr(DynamicObject dynamicObject, String key,
         return value;
     }
 
-    @Specialization(guards = "key == cachedKey", limit = "getAttributeAccessInlineCacheMaxDepth()", replaces = "readFinalAttr")
-    protected Object readDirect(DynamicObject dynamicObject, @SuppressWarnings("unused") String key,
-                    @Cached("key") String cachedKey,
+    @Specialization(limit = "getAttributeAccessInlineCacheMaxDepth()", replaces = "readFinalAttr")
+    protected Object readDirect(DynamicObject dynamicObject, String key,
+                    @CachedLibrary("dynamicObject") DynamicObjectLibrary dylib) {
+        return dylib.getOrDefault(dynamicObject, key, PNone.NO_VALUE);
+    }
+
+    @Specialization(guards = "isHiddenKey(key)", limit = "getAttributeAccessInlineCacheMaxDepth()")
+    protected Object readDirectHidden(DynamicObject dynamicObject, Object key,
                     @CachedLibrary("dynamicObject") DynamicObjectLibrary dylib) {
-        return dylib.getOrDefault(dynamicObject, cachedKey, PNone.NO_VALUE);
+        return dylib.getOrDefault(dynamicObject, key, PNone.NO_VALUE);
     }
 
-    @Specialization(limit = "getAttributeAccessInlineCacheMaxDepth()", replaces = {"readDirect", "readFinalAttr"})
+    @Specialization(guards = "!isHiddenKey(key)", replaces = {"readDirect", "readFinalAttr"}, limit = "getAttributeAccessInlineCacheMaxDepth()")
     protected Object read(DynamicObject dynamicObject, Object key,
                     @Cached CastToJavaStringNode castNode,
                     @CachedLibrary("dynamicObject") DynamicObjectLibrary dylib) {

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

@@ -50,6 +50,7 @@
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectLibrary;
+import com.oracle.truffle.api.object.HiddenKey;
 
 @ImportStatic(PythonOptions.class)
 @ReportPolymorphism
@@ -58,6 +59,8 @@ public abstract class WriteAttributeToDynamicObjectNode extends ObjectAttributeN
 
     public abstract boolean execute(Object primary, Object key, Object value);
 
+    public abstract boolean execute(Object primary, HiddenKey key, Object value);
+
     public abstract boolean execute(Object primary, String key, Object value);
 
     public static WriteAttributeToDynamicObjectNode create() {
@@ -68,17 +71,21 @@ public static WriteAttributeToDynamicObjectNode getUncached() {
         return WriteAttributeToDynamicObjectNodeGen.getUncached();
     }
 
-    @SuppressWarnings("unused")
-    @Specialization(guards = "key == cachedKey", limit = "getAttributeAccessInlineCacheMaxDepth()")
-    protected boolean writeDirect(DynamicObject dynamicObject, @SuppressWarnings("unused") String key, Object value,
-                    @Cached("key") String cachedKey,
+    @Specialization(limit = "getAttributeAccessInlineCacheMaxDepth()")
+    protected boolean writeDirect(DynamicObject dynamicObject, String key, Object value,
+                    @CachedLibrary("dynamicObject") DynamicObjectLibrary dylib) {
+        dylib.put(dynamicObject, key, value);
+        return true;
+    }
+
+    @Specialization(guards = "isHiddenKey(key)", limit = "getAttributeAccessInlineCacheMaxDepth()")
+    protected boolean writeDirectHidden(DynamicObject dynamicObject, Object key, Object value,
                     @CachedLibrary("dynamicObject") DynamicObjectLibrary dylib) {
-        dylib.put(dynamicObject, cachedKey, value);
+        dylib.put(dynamicObject, key, value);
         return true;
     }
 
-    @SuppressWarnings("unused")
-    @Specialization(limit = "getAttributeAccessInlineCacheMaxDepth()", replaces = "writeDirect")
+    @Specialization(guards = "!isHiddenKey(key)", replaces = "writeDirect", limit = "getAttributeAccessInlineCacheMaxDepth()")
     protected boolean write(DynamicObject dynamicObject, Object key, Object value,
                     @Cached CastToJavaStringNode castNode,
                     @CachedLibrary("dynamicObject") DynamicObjectLibrary dylib) {