enhance ReadAttributeFromObjectNode with functionality to read from object dict if set

Author: cosminbasca

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/ObjectBuiltins.java

@@ -57,7 +57,6 @@
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.cext.PythonNativeClass;
 import com.oracle.graal.python.builtins.objects.cext.PythonNativeObject;
-import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes;
 import com.oracle.graal.python.builtins.objects.common.PHashingCollection;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
@@ -402,19 +401,6 @@ private LazyPythonClass getDataClass(Object descr) {
     @Builtin(name = SpecialMethodNames.__GETATTR__, fixedNumOfPositionalArgs = 2)
     @GenerateNodeFactory
     public abstract static class GetattrNode extends PythonBinaryBuiltinNode {
-        @Specialization
-        Object getattr(PythonObject object, Object key,
-                        @Cached("create()") HashingStorageNodes.GetItemNode getItemNode) {
-            PHashingCollection dict = object.getDict();
-            if (dict != null) {
-                Object value = getItemNode.execute(dict.getDictStorage(), key);
-                if (value != null) {
-                    return value;
-                }
-            }
-            throw raise(AttributeError, "'%p' object has no attribute %s", object, key);
-        }
-
         @Specialization
         Object getattr(Object object, Object key) {
             throw raise(AttributeError, "'%p' object has no attribute %s", object, key);

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

@@ -41,11 +41,13 @@
 package com.oracle.graal.python.nodes.attributes;
 
 import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes;
+import com.oracle.graal.python.builtins.objects.common.PHashingCollection;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.builtins.objects.str.PString;
+import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.interop.PForeignToPTypeNode;
-import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -102,6 +104,7 @@ protected Object attrKey(Object key) {
     @Specialization(limit = "1", //
                     guards = {
                                     "object == cachedObject",
+                                    "cachedDict == null",
                                     "checkShape(object, cachedObject, cachedShape)",
                                     "key == cachedKey",
                                     "!isNull(loc)",
@@ -116,6 +119,7 @@ protected Object readDirectFinal(PythonObject object, Object key,
                     @Cached("key") Object cachedKey,
                     @Cached("attrKey(key)") Object attrKey,
                     @Cached("object.getStorage().getShape()") Shape cachedShape,
+                    @Cached("object.getDict()") PHashingCollection cachedDict,
                     @Cached("cachedShape.getValidAssumption()") Assumption layoutAssumption,
                     @Cached("getLocationOrNull(cachedShape.getProperty(attrKey))") Location loc,
                     @Cached("loc.getFinalAssumption()") Assumption finalAssumption,
@@ -133,6 +137,7 @@ private static boolean assertFinal(PythonObject object, Object key, Object cache
     @Specialization(limit = "getIntOption(getContext(), AttributeAccessInlineCacheMaxDepth)", //
                     guards = {
                                     "object.getStorage().getShape() == cachedShape",
+                                    "cachedDict == null",
                                     "key == cachedKey",
                                     "isNull(loc) || !loc.isAssumedFinal()",
                     }, //
@@ -141,6 +146,7 @@ protected Object readDirect(PythonObject object, Object key,
                     @Cached("key") Object cachedKey,
                     @Cached("attrKey(cachedKey)") Object attrKey,
                     @Cached("object.getStorage().getShape()") Shape cachedShape,
+                    @Cached("object.getDict()") PHashingCollection cachedDict,
                     @Cached("cachedShape.getValidAssumption()") Assumption layoutAssumption,
                     @Cached("getLocationOrNull(cachedShape.getProperty(attrKey))") Location loc) {
         if (loc == null) {
@@ -153,18 +159,20 @@ protected Object readDirect(PythonObject object, Object key,
     @SuppressWarnings("unused")
     @Specialization(guards = {
                     "object.getStorage().getShape() == cachedShape",
+                    "cachedDict == null",
                     "!layoutAssumption.isValid()"
     })
     protected Object updateShapeAndRead(PythonObject object, Object key,
                     @Cached("object.getStorage().getShape()") Shape cachedShape,
+                    @Cached("object.getDict()") PHashingCollection cachedDict,
                     @Cached("cachedShape.getValidAssumption()") Assumption layoutAssumption,
                     @Cached("create()") ReadAttributeFromObjectNode nextNode) {
         CompilerDirectives.transferToInterpreter();
         object.getStorage().updateShape();
         return nextNode.execute(object, key);
     }
 
-    @Specialization(replaces = "readDirect")
+    @Specialization(guards = "object.getDict() == null", replaces = "readDirect")
     protected Object readIndirect(PythonObject object, Object key) {
         Object value = object.getStorage().get(attrKey(key));
         if (value == null) {
@@ -174,6 +182,17 @@ protected Object readIndirect(PythonObject object, Object key) {
         }
     }
 
+    @Specialization(guards = "object.getDict() != null")
+    protected Object readFromDict(PythonObject object, Object key,
+                    @Cached("create()") HashingStorageNodes.GetItemNode getItemNode) {
+        Object value = getItemNode.execute(object.getDict().getDictStorage(), key);
+        if (value == null) {
+            return PNone.NO_VALUE;
+        } else {
+            return value;
+        }
+    }
+
     @Specialization(guards = "isForeignObject(object)")
     protected Object readForeign(TruffleObject object, Object key,
                     @Cached("create()") PForeignToPTypeNode fromForeign,