intrinsified dict_from_list

Author: tomasstupka

graalpython/com.oracle.graal.python.cext/src/modsupport.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, 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
@@ -443,7 +443,7 @@ MUST_INLINE static PyObject* _PyTruffle_BuildValue(const char* format, va_list v
             if (v->prev == NULL) {
                 PyErr_SetString(PyExc_SystemError, "'}' without '{' in Py_BuildValue");
             } else {
-                PyList_Append(v->prev->list, to_sulong(polyglot_invoke(PY_TRUFFLE_CEXT, "dict_from_list", to_java(v->list))));
+                PyList_Append(v->prev->list, to_sulong(polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_Dict_From_List", to_java(v->list))));
                 next = v;
                 v = v->prev;
                 free(next);

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

@@ -44,6 +44,7 @@
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.SystemError;
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.TypeError;
 import static com.oracle.graal.python.builtins.objects.cext.common.CExtContext.METH_CLASS;
+import static com.oracle.graal.python.nodes.ErrorMessages.LIST_CANNOT_BE_CONVERTED_TO_DICT;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__DOC__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__MODULE__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__NAME__;
@@ -177,6 +178,7 @@
 import com.oracle.graal.python.builtins.objects.function.Signature;
 import com.oracle.graal.python.builtins.objects.getsetdescriptor.GetSetDescriptor;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
+import com.oracle.graal.python.builtins.objects.list.ListBuiltins;
 import com.oracle.graal.python.builtins.objects.memoryview.BufferLifecycleManager;
 import com.oracle.graal.python.builtins.objects.memoryview.MemoryViewNodes;
 import com.oracle.graal.python.builtins.objects.memoryview.NativeBufferLifecycleManager;
@@ -284,7 +286,9 @@
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.object.DynamicObjectLibrary;
 import com.oracle.truffle.api.object.HiddenKey;
+import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
+import com.oracle.truffle.api.profiles.LoopConditionProfile;
 import com.oracle.truffle.api.profiles.ValueProfile;
 import com.oracle.truffle.api.utilities.CyclicAssumption;
 
@@ -407,7 +411,38 @@ static Object run() {
         }
     }
 
-    ///////////// mappingproxy /////////////
+    @Builtin(name = "PyTruffle_Dict_From_List", minNumOfPositionalArgs = 1)
+    @GenerateNodeFactory
+    public abstract static class DictFromListNode extends PythonUnaryBuiltinNode {
+        @Specialization
+        public Object values(VirtualFrame frame, Object list,
+                        @Cached com.oracle.graal.python.lib.PyObjectSizeNode sizeNode,
+                        @Cached ListBuiltins.GetItemNode getItemNode,
+                        @Cached BranchProfile wrongLenProfile,
+                        @Cached LoopConditionProfile loopProfile,
+                        @CachedLibrary(limit = "3") HashingStorageLibrary lib,
+                        @Cached PRaiseNativeNode raiseNativeNode,
+                        @Cached TransformExceptionToNativeNode transformExceptionToNativeNode) {
+            try {
+                int size = sizeNode.execute(frame, list);
+                if (size % 2 != 0) {
+                    wrongLenProfile.enter();
+                    return raiseNativeNode.raise(frame, getContext().getNativeNull(), PythonBuiltinClassType.SystemError, LIST_CANNOT_BE_CONVERTED_TO_DICT);
+                }
+                HashingStorage store = PDict.createNewStorage(false, size);
+                loopProfile.profileCounted(size);
+                for (int i = 0; loopProfile.profile(i < size); i = i + 2) {
+                    Object k = getItemNode.execute(frame, list, i);
+                    Object v = getItemNode.execute(frame, list, i + 1);
+                    store = lib.setItem(store, k, v);
+                }
+                return factory().createDict(store);
+            } catch (PException e) {
+                transformExceptionToNativeNode.execute(e);
+                return getContext().getNativeNull();
+            }
+        }
+    }
 
     @Builtin(name = "Py_DECREF", minNumOfPositionalArgs = 1)
     @Builtin(name = "Py_INCREF", minNumOfPositionalArgs = 1)

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

@@ -405,6 +405,7 @@ public abstract class ErrorMessages {
     public static final String LEN_SHOULD_RETURN_GT_ZERO = "__len__() should return >= 0";
     public static final String LENGTH_HINT_SHOULD_RETURN_MT_ZERO = "__length_hint__() should return >= 0";
     public static final String LIST_ASSIGMENT_INDEX_OUT_OF_RANGE = "list assignment index out of range";
+    public static final String LIST_CANNOT_BE_CONVERTED_TO_DICT = "list cannot be converted to dict";
     public static final String LIST_INDEX_OUT_OF_RANGE = "list index out of range";
     public static final String LIST_LENGTH_OUT_OF_RANGE = "list length out of range";
     public static final String LOCAL_VAR_REFERENCED_BEFORE_ASSIGMENT = "local variable '%s' referenced before assignment";

graalpython/lib-graalpython/python_cext.py

@@ -53,15 +53,6 @@ def decorator(fun):
             return make_may_raise_wrapper(fun, error_result)
         return decorator
 
-@may_raise
-def dict_from_list(lst):
-    if len(lst) % 2 != 0:
-        raise SystemError("list cannot be converted to dict")
-    d = {}
-    for i in range(0, len(lst), 2):
-        d[lst[i]] = lst[i + 1]
-    return d
-
 ##################### C EXT HELPERS
 
 def PyTruffle_Debug(*args):