Implement _PyDict_HasOnlyStringKeys

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_modsupport.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2025, 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
@@ -81,6 +81,15 @@ def _reference_parse_tuple(args):
         raise TypeError
 
 
+def _reference_validate_keywords(args):
+    kwargs = args[0]
+    if not isinstance(kwargs, dict):
+        raise SystemError
+    if not all(isinstance(k, str) for k in kwargs):
+        raise TypeError
+    return 1
+
+
 class Indexable:
     def __int__(self):
         return 456
@@ -717,3 +726,16 @@ def compare_new_object(x, y):
         arguments=["PyObject* a"],
         cmpfunc=compare_new_object
     )
+
+    test_PyArg_ValidateKeywordArguments = CPyExtFunction(
+        _reference_validate_keywords,
+        lambda: (
+            ({'a': 1, 'b': 2},),
+            ({'a': 1, 1: 2},),
+            ("not-dict",),
+        ),
+        resultspec='i',
+        argspec='O',
+        arguments=["PyObject* kwds"],
+        cmpfunc=unhandled_error_compare,
+    )

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextDictBuiltins.java

@@ -76,6 +76,7 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.CApiContext;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions;
 import com.oracle.graal.python.builtins.objects.cext.structs.CStructAccess;
+import com.oracle.graal.python.builtins.objects.common.DynamicObjectStorage;
 import com.oracle.graal.python.builtins.objects.common.EconomicMapStorage;
 import com.oracle.graal.python.builtins.objects.common.HashingCollectionNodes.SetItemNode;
 import com.oracle.graal.python.builtins.objects.common.HashingStorage;
@@ -93,6 +94,7 @@
 import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageLen;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageSetItem;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.HashingStorageSetItemWithHash;
+import com.oracle.graal.python.builtins.objects.common.KeywordsStorage;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.GetItemNode;
 import com.oracle.graal.python.builtins.objects.dict.DictBuiltins.ClearNode;
 import com.oracle.graal.python.builtins.objects.dict.DictBuiltins.PopNode;
@@ -105,6 +107,7 @@
 import com.oracle.graal.python.lib.PyDictSetDefault;
 import com.oracle.graal.python.lib.PyObjectGetAttr;
 import com.oracle.graal.python.lib.PyObjectHashNode;
+import com.oracle.graal.python.lib.PyUnicodeCheckNode;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.builtins.ListNodes.ConstructListNode;
 import com.oracle.graal.python.nodes.call.CallNode;
@@ -127,6 +130,7 @@
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.InlinedBranchProfile;
+import com.oracle.truffle.api.profiles.InlinedConditionProfile;
 import com.oracle.truffle.api.profiles.InlinedLoopConditionProfile;
 
 public final class PythonCextDictBuiltins {
@@ -654,4 +658,32 @@ static boolean isTracked(Object object, CStructAccess.ReadI64Node readI64Node) {
             // return false;
         }
     }
+
+    @CApiBuiltin(ret = Int, args = {PyObject}, call = Direct)
+    abstract static class _PyDict_HasOnlyStringKeys extends CApiUnaryBuiltinNode {
+
+        @Specialization
+        static int check(PDict dict,
+                        @Bind Node inliningTarget,
+                        @Cached InlinedConditionProfile storageProfile,
+                        @Cached InlinedLoopConditionProfile loopConditionProfile,
+                        @Cached HashingStorageGetIterator getIter,
+                        @Cached HashingStorageIteratorNext getIterNext,
+                        @Cached HashingStorageIteratorKey getIterKey,
+                        @Cached PyUnicodeCheckNode check) {
+            HashingStorage storage = dict.getDictStorage();
+            // Keywords and dynamic object storages only allow strings
+            if (storageProfile.profile(inliningTarget, storage instanceof KeywordsStorage || storage instanceof DynamicObjectStorage)) {
+                return 1;
+            }
+            HashingStorageIterator it = getIter.execute(inliningTarget, storage);
+            while (loopConditionProfile.profile(inliningTarget, getIterNext.execute(inliningTarget, storage, it))) {
+                Object key = getIterKey.execute(inliningTarget, storage, it);
+                if (!check.execute(inliningTarget, key)) {
+                    return 0;
+                }
+            }
+            return 1;
+        }
+    }
 }

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

@@ -1044,7 +1044,6 @@ public final class CApiFunction {
     @CApiBuiltin(name = "_PyDict_DelItemIf", ret = Int, args = {PyObject, PyObject, func_objint}, call = NotImplemented)
     @CApiBuiltin(name = "_PyDict_DelItem_KnownHash", ret = Int, args = {PyObject, PyObject, Py_hash_t}, call = NotImplemented)
     @CApiBuiltin(name = "_PyDict_GetItemWithError", ret = PyObject, args = {PyObject, PyObject}, call = NotImplemented)
-    @CApiBuiltin(name = "_PyDict_HasOnlyStringKeys", ret = Int, args = {PyObject}, call = NotImplemented)
     @CApiBuiltin(name = "_PyDict_MergeEx", ret = Int, args = {PyObject, PyObject, Int}, call = NotImplemented)
     @CApiBuiltin(name = "_PyDict_SizeOf", ret = Py_ssize_t, args = {PYDICTOBJECT_PTR}, call = NotImplemented)
     @CApiBuiltin(name = "_PyErr_CheckSignals", ret = Int, args = {}, call = NotImplemented)