Remove HiddenKey from read/write attribute nodes

Author: otethal

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -953,7 +953,7 @@ public Shape getEmptyShape() {
 
     public Shape getShapeForClass(PythonAbstractClass klass) {
         if (isSingleContext()) {
-            return Shape.newBuilder(getEmptyShape()).addConstantProperty(HiddenAttr.CLASS.getKeyTodoRemoveThis(), klass, 0).build();
+            return Shape.newBuilder(getEmptyShape()).addConstantProperty(HiddenAttr.getClassHiddenKey(), klass, 0).build();
         } else {
             return getEmptyShape();
         }
@@ -968,7 +968,7 @@ public Shape getBuiltinTypeInstanceShape(PythonBuiltinClassType type) {
         Shape shape = builtinTypeInstanceShapes[ordinal];
         if (shape == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            Shape.DerivedBuilder shapeBuilder = Shape.newBuilder(getEmptyShape()).addConstantProperty(HiddenAttr.CLASS.getKeyTodoRemoveThis(), type, 0);
+            Shape.DerivedBuilder shapeBuilder = Shape.newBuilder(getEmptyShape()).addConstantProperty(HiddenAttr.getClassHiddenKey(), type, 0);
             if (!type.isBuiltinWithDict()) {
                 shapeBuilder.shapeFlags(PythonObject.HAS_SLOTS_BUT_NO_DICT_FLAG);
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CExtNodes.java

@@ -953,7 +953,7 @@ public final long execute(Object cls, CFields nativeMemberName, HiddenAttr manag
         static long doSingleContext(Object cls, CFields nativeMember, HiddenAttr managedMemberName, Function<PythonBuiltinClassType, Integer> builtinCallback,
                                     @Bind("this") Node inliningTarget,
                                     @Cached GetBaseClassNode getBaseClassNode,
-                                    @Cached HiddenAttr.ReadNode readAttrNode,  // TODO: this was createForceType()
+                                    @Cached HiddenAttr.ReadNode readAttrNode,
                                     @Cached CStructAccess.ReadI64Node getTypeMemberNode,
                                     @Cached PyNumberAsSizeNode asSizeNode) {
             CompilerAsserts.partialEvaluationConstant(builtinCallback);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/HiddenAttr.java

@@ -91,7 +91,6 @@ public final class HiddenAttr {
     public static final HiddenAttr GETBUFFER = new HiddenAttr("__getbuffer__");
     public static final HiddenAttr RELEASEBUFFER = new HiddenAttr("__releasebuffer__");
     public static final HiddenAttr DOC = new HiddenAttr(J___DOC__);
-
     public static final HiddenAttr WEAKLIST = new HiddenAttr("__weaklist__");           // _weakref
     public static final HiddenAttr WEAK_REF_QUEUE = new HiddenAttr("weakRefQueue");     // _weakref
     public static final HiddenAttr ENCODER_OBJECT = new HiddenAttr("encoder_object");   // cjkcodecs
@@ -131,8 +130,9 @@ private HiddenAttr(String keyName) {
         key = new HiddenKey(keyName);
     }
 
-    public HiddenKey getKeyTodoRemoveThis() {
-        return key;
+    // temporary, will be removed when we have no DynamicObjects and Shapes
+    public static HiddenKey getClassHiddenKey() {
+        return CLASS.key;
     }
 
     public String getName() {

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

@@ -60,7 +60,6 @@
 import com.oracle.truffle.api.nodes.Node;
 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;
 import com.oracle.truffle.api.strings.TruffleString;
@@ -82,8 +81,6 @@ public static ReadAttributeFromDynamicObjectNode getUncached() {
 
     public abstract Object execute(Object object, TruffleString key);
 
-    public abstract Object execute(Object object, HiddenKey key);
-
     protected static Object getAttribute(DynamicObject object, TruffleString key) {
         return DynamicObjectLibrary.getUncached().getOrDefault(object, key, PNone.NO_VALUE);
     }
@@ -153,17 +150,12 @@ protected static Object readDirect(DynamicObject dynamicObject, TruffleString ke
         return dylib.getOrDefault(dynamicObject, key, PNone.NO_VALUE);
     }
 
-    @Specialization(guards = "isHiddenKey(key)", limit = "getAttributeAccessInlineCacheMaxDepth()")
-    protected static Object readDirectHidden(DynamicObject dynamicObject, Object key,
-                    @CachedLibrary("dynamicObject") DynamicObjectLibrary dylib) {
-        return dylib.getOrDefault(dynamicObject, key, PNone.NO_VALUE);
-    }
-
-    @Specialization(guards = "!isHiddenKey(key)", replaces = {"readDirect", "readFinalAttr"}, limit = "getAttributeAccessInlineCacheMaxDepth()")
+    @Specialization(replaces = {"readDirect", "readFinalAttr"}, limit = "getAttributeAccessInlineCacheMaxDepth()")
     protected static Object read(DynamicObject dynamicObject, Object key,
                     @Bind("this") Node inliningTarget,
                     @Cached CastToTruffleStringNode castNode,
                     @CachedLibrary("dynamicObject") DynamicObjectLibrary dylib) {
+        assert !isHiddenKey(key);
         return dylib.getOrDefault(dynamicObject, attrKey(inliningTarget, key, castNode), PNone.NO_VALUE);
     }
 }

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

@@ -41,8 +41,6 @@
 package com.oracle.graal.python.nodes.attributes;
 
 import static com.oracle.graal.python.builtins.objects.cext.structs.CFields.PyTypeObject__tp_dict;
-import static com.oracle.truffle.api.CompilerDirectives.shouldNotReachHere;
-import static com.oracle.truffle.api.CompilerDirectives.transferToInterpreter;
 
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.cext.PythonAbstractNativeObject;
@@ -67,7 +65,6 @@
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
-import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.GenerateInline;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.ImportStatic;
@@ -79,7 +76,6 @@
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.object.HiddenKey;
 import com.oracle.truffle.api.profiles.InlinedConditionProfile;
 import com.oracle.truffle.api.strings.TruffleString;
 
@@ -142,21 +138,15 @@ protected static Object readFromBuiltinModuleDict(PythonModule object, TruffleSt
         }
     }
 
-    // hidden keys are always on the dynamic object store
-    @Specialization
-    protected static Object readHiddenKey(PythonObject object, HiddenKey key,
-                    @Shared("readDynamic") @Cached ReadAttributeFromDynamicObjectNode readAttributeFromDynamicObjectNode) {
-        return readAttributeFromDynamicObjectNode.execute(object.getStorage(), key);
-    }
-
     // any python object attribute read
-    @Specialization(guards = "!isHiddenKey(key)")
+    @Specialization
     protected static Object readObjectAttribute(PythonObject object, Object key,
                     @Bind("this") Node inliningTarget,
                     @Cached InlinedConditionProfile profileHasDict,
                     @Exclusive @Cached GetDictIfExistsNode getDict,
-                    @Shared("readDynamic") @Cached ReadAttributeFromDynamicObjectNode readAttributeFromDynamicObjectNode,
+                    @Cached ReadAttributeFromDynamicObjectNode readAttributeFromDynamicObjectNode,
                     @Exclusive @Cached HashingStorageGetItem getItem) {
+        assert !isHiddenKey(key);
         var dict = getDict.execute(object);
         if (profileHasDict.profile(inliningTarget, dict == null)) {
             return readAttributeFromDynamicObjectNode.execute(object.getStorage(), key);
@@ -212,10 +202,7 @@ protected static Object readNativeClass(PythonAbstractNativeObject object, Objec
                         @Bind("this") Node inliningTarget,
                         @Cached CStructAccess.ReadObjectNode getNativeDict,
                         @Exclusive @Cached HashingStorageGetItem getItem) {
-            if (key instanceof HiddenKey hk) {
-                transferToInterpreter();
-                throw shouldNotReachHere("Attempt to access HiddenKey " + hk + " from a native object");
-            }
+            assert !isHiddenKey(key);
             return readNative(inliningTarget, key, getNativeDict.readFromObj(object, PyTypeObject__tp_dict), getItem);
         }
     }

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

@@ -53,7 +53,6 @@
 import com.oracle.truffle.api.nodes.Node;
 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.strings.TruffleString;
 
 /**
@@ -67,8 +66,6 @@
 @GenerateInline(false) // Should be reconsidered during anticipated refactoring from DOM library
 public abstract class WriteAttributeToDynamicObjectNode extends ObjectAttributeNode {
 
-    public abstract boolean execute(Object primary, HiddenKey key, Object value);
-
     public abstract boolean execute(Object primary, TruffleString key, Object value);
 
     public abstract boolean execute(Object primary, Object key, Object value);
@@ -89,18 +86,12 @@ static boolean writeDirect(DynamicObject dynamicObject, TruffleString key, Objec
         return true;
     }
 
-    @Specialization(limit = "getAttributeAccessInlineCacheMaxDepth()")
-    static boolean writeDirectHidden(DynamicObject dynamicObject, HiddenKey key, Object value,
-                    @CachedLibrary("dynamicObject") DynamicObjectLibrary dylib) {
-        dylib.put(dynamicObject, key, value);
-        return true;
-    }
-
-    @Specialization(guards = "!isHiddenKey(key)", replaces = "writeDirect", limit = "getAttributeAccessInlineCacheMaxDepth()")
+    @Specialization(replaces = "writeDirect", limit = "getAttributeAccessInlineCacheMaxDepth()")
     static boolean write(DynamicObject dynamicObject, Object key, Object value,
                     @Bind("this") Node inliningTarget,
                     @Cached CastToTruffleStringNode castNode,
                     @CachedLibrary("dynamicObject") DynamicObjectLibrary dylib) {
+        assert !isHiddenKey(key);
         dylib.put(dynamicObject, attrKey(inliningTarget, key, castNode), value);
         return true;
     }