GR-12492: access dict.getDictStorage via a node (avoids generating an invoke node due the several types of HashingCollections available)

stylefix

Author: cosminbasca

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/HashingCollectionNodes.java

@@ -42,6 +42,7 @@
 
 import com.oracle.graal.python.builtins.objects.common.HashingCollectionNodesFactory.LenNodeGen;
 import com.oracle.graal.python.builtins.objects.common.HashingCollectionNodesFactory.SetItemNodeGen;
+import com.oracle.graal.python.builtins.objects.common.HashingCollectionNodesFactory.GetDictStorageNodeGen;
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.truffle.api.dsl.Cached;
@@ -83,4 +84,20 @@ public static SetItemNode create() {
             return SetItemNodeGen.create();
         }
     }
+
+    @ImportStatic({PGuards.class})
+    public abstract static class GetDictStorageNode extends PNodeWithContext {
+
+        public abstract HashingStorage execute(PHashingCollection c);
+
+        @Specialization(limit = "4", guards = {"c.getClass() == cachedClass"})
+        HashingStorage doWithStorage(PHashingCollection c,
+                        @Cached("c.getClass()") Class<? extends PHashingCollection> cachedClass) {
+            return cachedClass.cast(c).getDictStorage();
+        }
+
+        public static GetDictStorageNode create() {
+            return GetDictStorageNodeGen.create();
+        }
+    }
 }

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

@@ -41,12 +41,14 @@
 package com.oracle.graal.python.nodes.attributes;
 
 import com.oracle.graal.python.builtins.objects.common.DynamicObjectStorage;
+import com.oracle.graal.python.builtins.objects.common.HashingCollectionNodes;
 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.runtime.PythonOptions;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.object.HiddenKey;
 import com.oracle.truffle.api.object.Location;
@@ -55,6 +57,16 @@
 
 @ImportStatic({PGuards.class, PythonOptions.class})
 public abstract class ObjectAttributeNode extends PNodeWithContext {
+    private @Child HashingCollectionNodes.GetDictStorageNode getDictStorageNode;
+
+    public HashingCollectionNodes.GetDictStorageNode getGetDictStorageNode() {
+        if (getDictStorageNode == null) {
+            CompilerDirectives.transferToInterpreterAndInvalidate();
+            getDictStorageNode = insert(HashingCollectionNodes.GetDictStorageNode.create());
+        }
+        return getDictStorageNode;
+    }
+
     protected Object attrKey(Object key) {
         if (key instanceof PString) {
             return ((PString) key).getValue();
@@ -68,7 +80,7 @@ protected boolean isDictUnsetOrSameAsStorage(PythonObject object, ValueProfile d
         if (dict == null) {
             return true;
         } else {
-            return dict.getDictStorage() instanceof DynamicObjectStorage.PythonObjectDictStorage;
+            return getGetDictStorageNode().execute(dict) instanceof DynamicObjectStorage.PythonObjectDictStorage;
         }
     }