Avoid downcalls when setting native storage items

Author: msimacek

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

@@ -506,14 +506,6 @@ PyAPI_FUNC(void) PyTruffle_ObjectArrayRelease(PyObject** array, int32_t size) {
     }
 }
 
-PyAPI_FUNC(void) PyTruffle_SetStorageItem(PyObject** ptr, int32_t index, PyObject* newitem) {
-    Py_XSETREF(ptr[index], newitem);
-}
-
-PyAPI_FUNC(void) PyTruffle_InitializeStorageItem(PyObject** ptr, int32_t index, PyObject* newitem) {
-    ptr[index] = newitem;
-}
-
 #define ReadMember(object, offset, T) ((T*)(((char*)object) + offset))[0]
 
 PyAPI_FUNC(int) ReadShortMember(void* object, Py_ssize_t offset) {

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

@@ -124,8 +124,6 @@ public enum NativeCAPISymbol implements NativeCExtSymbol {
     FUN_PTR_COMPARE("truffle_ptr_compare", Int, Pointer, Pointer, Int),
     FUN_PTR_ADD("truffle_ptr_add", Pointer, Pointer, Py_ssize_t),
     FUN_PY_TRUFFLE_OBJECT_ARRAY_RELEASE("PyTruffle_ObjectArrayRelease", ArgDescriptor.Void, Pointer, Int),
-    FUN_PY_TRUFFLE_SET_STORAGE_ITEM("PyTruffle_SetStorageItem", ArgDescriptor.Void, Pointer, Int, PyObject),
-    FUN_PY_TRUFFLE_INITIALIZE_STORAGE_ITEM("PyTruffle_InitializeStorageItem", ArgDescriptor.Void, Pointer, Int, PyObject),
     FUN_PY_OBJECT_GET_DICT_PTR("_PyObject_GetDictPtr", Pointer, PyObject),
     FUN_PY_OBJECT_GENERIC_SET_DICT("PyObject_GenericSetDict", Int, PyObject, PyObject, Pointer),
     FUN_PY_OBJECT_NEW("PyTruffle_Object_New", PyObjectTransfer, PyTypeObject),

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

@@ -25,8 +25,6 @@
  */
 package com.oracle.graal.python.builtins.objects.common;
 
-import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol.FUN_PY_TRUFFLE_INITIALIZE_STORAGE_ITEM;
-import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol.FUN_PY_TRUFFLE_SET_STORAGE_ITEM;
 import static com.oracle.graal.python.builtins.objects.iterator.IteratorBuiltins.NextHelperNode.STOP_MARKER;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.IndexError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.MemoryError;
@@ -50,7 +48,6 @@
 import com.oracle.graal.python.builtins.objects.bytes.BytesNodes;
 import com.oracle.graal.python.builtins.objects.bytes.PBytesLike;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes;
-import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PCallCapiFunction;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.NativeToPythonNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.PythonToNativeNewRefNode;
 import com.oracle.graal.python.builtins.objects.cext.structs.CStructAccess;
@@ -1146,9 +1143,14 @@ protected static void doNativeByte(NativeByteSequenceStorage storage, int idx, O
 
         @Specialization
         protected static void doNativeObject(NativeObjectSequenceStorage storage, int idx, Object value,
-                        @Cached PCallCapiFunction call,
-                        @Cached PythonToNativeNewRefNode toSulongNode) {
-            call.call(FUN_PY_TRUFFLE_SET_STORAGE_ITEM, storage.getPtr(), idx, toSulongNode.execute(value));
+                        @Bind("this") Node inliningTarget,
+                        @Cached PythonToNativeNewRefNode toNative,
+                        @Cached CStructAccess.ReadPointerNode readPointerNode,
+                        @Cached CStructAccess.WritePointerNode writePointerNode,
+                        @Cached CExtNodes.DecRefPointerNode decRefPointerNode) {
+            Object old = readPointerNode.readArrayElement(storage.getPtr(), idx);
+            writePointerNode.writeArrayElement(storage.getPtr(), idx, toNative.execute(value));
+            decRefPointerNode.execute(inliningTarget, old);
         }
     }
 
@@ -1167,9 +1169,9 @@ protected static void doNativeByte(NativeByteSequenceStorage storage, int idx, O
 
         @Specialization
         protected static void doNativeObject(NativeObjectSequenceStorage storage, int idx, Object value,
-                        @Cached PCallCapiFunction call,
-                        @Cached PythonToNativeNewRefNode toSulongNode) {
-            call.call(FUN_PY_TRUFFLE_INITIALIZE_STORAGE_ITEM, storage.getPtr(), idx, toSulongNode.execute(value));
+                        @Cached CStructAccess.WritePointerNode writePointerNode,
+                        @Cached PythonToNativeNewRefNode toNative) {
+            writePointerNode.writeArrayElement(storage.getPtr(), idx, toNative.execute(value));
         }
     }