Introduce HashingStorageGetItemStringKey.

Author: woess

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

@@ -69,6 +69,7 @@
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.PRaiseNode;
+import com.oracle.graal.python.nodes.attributes.ReadAttributeFromPythonObjectNode;
 import com.oracle.graal.python.nodes.interop.PForeignToPTypeNode;
 import com.oracle.graal.python.nodes.object.IsForeignObjectNode;
 import com.oracle.graal.python.nodes.util.CastBuiltinStringToTruffleStringNode;
@@ -146,6 +147,46 @@ static Object foreign(Node inliningTarget, ForeignHashingStorage self, Object ke
         }
     }
 
+    @GenerateUncached
+    @GenerateInline
+    @GenerateCached(false)
+    public abstract static class HashingStorageGetItemStringKey extends Node {
+        public abstract Object execute(Node inliningTarget, HashingStorage self, TruffleString key);
+
+        @Specialization
+        static Object economicMap(Node inliningTarget, EconomicMapStorage self, TruffleString key,
+                        @Cached TruffleString.HashCodeNode hashCodeNode,
+                        @Cached ObjectHashMap.GetNode getNode) {
+            return getNode.execute(null, inliningTarget, self.map, key, PyObjectHashNode.hash(key, hashCodeNode));
+        }
+
+        @Specialization
+        static Object dom(Node inliningTarget, DynamicObjectStorage self, TruffleString key,
+                        @Cached(inline = false) ReadAttributeFromPythonObjectNode readKey,
+                        @Cached InlinedConditionProfile noValueProfile) {
+            return DynamicObjectStorage.GetItemNode.string(inliningTarget, self, key, -1, readKey, noValueProfile);
+        }
+
+        @Specialization
+        @SuppressWarnings("unused")
+        static Object empty(EmptyStorage self, TruffleString key) {
+            return null;
+        }
+
+        @Specialization
+        @InliningCutoff
+        static Object keywords(Node inliningTarget, KeywordsStorage self, TruffleString key,
+                        @Cached GetKeywordsStorageItemNode getNode) {
+            return getNode.execute(null, inliningTarget, self, key, -1);
+        }
+
+        @Specialization
+        static Object foreign(Node inliningTarget, ForeignHashingStorage self, TruffleString key,
+                        @Cached ForeignHashingStorage.GetNode getNode) {
+            return getNode.execute(inliningTarget, self, key);
+        }
+    }
+
     @GenerateUncached
     @GenerateInline
     @GenerateCached(false)

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -41,7 +41,7 @@
 package com.oracle.graal.python.nodes.attributes;
 
 import com.oracle.graal.python.builtins.objects.PNone;
-import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageGetItem;
+import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageGetItemStringKey;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.object.GetDictIfExistsNode;
@@ -74,7 +74,7 @@ public static ReadAttributeFromModuleNode getUncached() {
     static Object readModuleAttribute(PythonModule object, TruffleString key,
                     @Bind Node inliningTarget,
                     @Cached GetDictIfExistsNode getDict,
-                    @Cached HashingStorageGetItem getItem) {
+                    @Cached HashingStorageGetItemStringKey getItem) {
         var dict = getDict.execute(object);
         Object value = getItem.execute(inliningTarget, dict.getDictStorage(), key);
         if (value == null) {

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

@@ -42,7 +42,7 @@
 
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.cext.PythonAbstractNativeObject;
-import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageGetItem;
+import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageGetItemStringKey;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.nodes.PNodeWithContext;
@@ -90,7 +90,7 @@ static Object readObjectAttribute(PythonObject object, TruffleString key,
                     @Cached InlinedConditionProfile profileHasDict,
                     @Exclusive @Cached GetDictIfExistsNode getDict,
                     @Cached ReadAttributeFromPythonObjectNode readAttributeFromPythonObjectNode,
-                    @Exclusive @Cached HashingStorageGetItem getItem) {
+                    @Exclusive @Cached HashingStorageGetItemStringKey getItem) {
         var dict = getDict.execute(object);
         if (profileHasDict.profile(inliningTarget, dict == null)) {
             return readAttributeFromPythonObjectNode.execute(object, key);
@@ -108,10 +108,10 @@ static Object readObjectAttribute(PythonObject object, TruffleString key,
     static Object readNativeObject(PythonAbstractNativeObject object, TruffleString key,
                     @Bind Node inliningTarget,
                     @Exclusive @Cached GetDictIfExistsNode getDict,
-                    @Exclusive @Cached HashingStorageGetItem getItem) {
+                    @Exclusive @Cached HashingStorageGetItemStringKey getItem) {
         PDict dict = getDict.execute(object);
         if (dict != null) {
-            Object result = getItem.execute(null, inliningTarget, dict.getDictStorage(), key);
+            Object result = getItem.execute(inliningTarget, dict.getDictStorage(), key);
             if (result != null) {
                 return result;
             }