implement PyTuple_SET_ITEM and don't decref existing elements in tuple_subtype_new

lukasstadler · lukasstadler · commit b1407bf711e5 · 2023-03-22T15:25:38.000+01:00
diff --git a/graalpython/com.oracle.graal.python.cext/include/cpython/tupleobject.h b/graalpython/com.oracle.graal.python.cext/include/cpython/tupleobject.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+/* Copyright (c) 2020, 2023, Oracle and/or its affiliates.
  * Copyright (C) 1996-2020 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -29,7 +29,7 @@ PyAPI_FUNC(void) _PyTuple_MaybeUntrack(PyObject *);
 #define PyTuple_GET_ITEM(op, i) PyTuple_GetItem(_PyObject_CAST(op), (i))
 
 /* Macro, *only* to be used to fill in brand new tuples */
-// LS: Py_SetItem behaves differently wrt. the existing element...
-#define PyTuple_SET_ITEM(op, i, v) PyTuple_SetItem(_PyObject_CAST(op), (i), (v))
+PyAPI_FUNC(int) _PyTuple_SET_ITEM(PyObject *, Py_ssize_t, PyObject *);
+#define PyTuple_SET_ITEM(op, i, v) _PyTuple_SET_ITEM(_PyObject_CAST(op), (i), (v))
 
 PyAPI_FUNC(void) _PyTuple_DebugMallocStats(FILE *out);
diff --git a/graalpython/com.oracle.graal.python.cext/src/capi.c b/graalpython/com.oracle.graal.python.cext/src/capi.c
@@ -904,6 +904,10 @@ void PyTruffle_SetStorageItem(PyObject** ptr, int32_t index, PyObject* newitem)
     Py_XSETREF(ptr[index], newitem);
 }
 
+void PyTruffle_InitializeStorageItem(PyObject** ptr, int32_t index, PyObject* newitem) {
+    ptr[index] = newitem;
+}
+
 PyAPI_FUNC(Py_ssize_t) PyTruffle_Object_Size(PyObject *op) {
     return ((PyVarObject*)op)->ob_size;
 }
@@ -2178,6 +2182,10 @@ PyAPI_FUNC(PyObject*) _PyTruffleObject_Call1(PyObject* a, PyObject* b, PyObject*
 PyAPI_FUNC(PyObject*) _PyTruffleObject_CallMethod1(PyObject* a, const char* b, PyObject* c, int d) {
     return Graal_PyTruffleObject_CallMethod1(a, truffleString(b), c, d);
 }
+#undef _PyTuple_SET_ITEM
+PyAPI_FUNC(int) _PyTuple_SET_ITEM(PyObject* a, Py_ssize_t b, PyObject* c) {
+    return Graal_PyTuple_SET_ITEM(a, b, c);
+}
 #undef _PyType_Lookup
 PyAPI_FUNC(PyObject*) _PyType_Lookup(PyTypeObject* a, PyObject* b) {
     return Graal_PyType_Lookup(a, b);
diff --git a/graalpython/com.oracle.graal.python.cext/src/capi.h b/graalpython/com.oracle.graal.python.cext/src/capi.h
@@ -597,6 +597,7 @@ typedef struct {
     BUILTIN(_PyTruffleObject_MakeTpCall, PyObject*, PyObject*, void*, int, void*, void*) \
     BUILTIN(_PyTruffleSet_NextEntry, PyObject*, PyObject*, Py_ssize_t) \
     BUILTIN(_PyTruffle_HashBytes, Py_hash_t, const char*) \
+    BUILTIN(_PyTuple_SET_ITEM, int, PyObject*, Py_ssize_t, PyObject*) \
     BUILTIN(_PyType_Lookup, PyObject*, PyTypeObject*, PyObject*) \
     BUILTIN(_PyUnicode_AsASCIIString, PyObject*, PyObject*, const char*) \
     BUILTIN(_PyUnicode_AsLatin1String, PyObject*, PyObject*, const char*) \
diff --git a/graalpython/com.oracle.graal.python.cext/src/tupleobject.c b/graalpython/com.oracle.graal.python.cext/src/tupleobject.c
@@ -88,7 +88,7 @@ PyObject * tuple_subtype_new(PyTypeObject *type, PyObject *iterable) {
     for (i = 0; i < n; i++) {
         item = PyTuple_GetItem(tmp, i);
         Py_INCREF(item);
-        PyTuple_SetItem((PyObject*)newobj, i, item);
+        newobj->ob_item[i] = item; // PyTuple_SETITEM
     }
     Py_DECREF(tmp);
     return (PyObject*) newobj;
diff --git a/graalpython/com.oracle.graal.python.jni/src/capi_forwards.h b/graalpython/com.oracle.graal.python.jni/src/capi_forwards.h
@@ -1503,6 +1503,7 @@ void unimplemented(const char* name) {
 #undef _PyTuple_DebugMallocStats
 #undef _PyTuple_MaybeUntrack
 #undef _PyTuple_Resize
+#undef _PyTuple_SET_ITEM
 #undef _PyType_CalculateMetaclass
 #undef _PyType_GetDocFromInternalDoc
 #undef _PyType_GetModuleByDef
@@ -5568,6 +5569,10 @@ PyAPI_FUNC(void) _PyTuple_MaybeUntrack(PyObject* a) {
 PyAPI_FUNC(int) _PyTuple_Resize(PyObject** a, Py_ssize_t b) {
     unimplemented("_PyTuple_Resize"); exit(-1);
 }
+PyAPI_FUNC(int) _PyTuple_SET_ITEM(PyObject* a, Py_ssize_t b, PyObject* c) {
+    int result = (int) Graal_PyTuple_SET_ITEM(a, b, c);
+    return result;
+}
 PyAPI_FUNC(PyTypeObject*) _PyType_CalculateMetaclass(PyTypeObject* a, PyObject* b) {
     unimplemented("_PyType_CalculateMetaclass"); exit(-1);
 }
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_tuple.py b/graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_tuple.py
@@ -58,6 +58,14 @@ def _reference_getitem(args):
     return t[idx]
 
 
+def _reference_setitem(args):
+    t = args[0]
+    idx = args[1]
+    if idx < 0 or idx >= len(t):
+        raise IndexError('tuple index out of range')
+    return None
+
+
 class MyStr(str):
 
     def __init__(self, s):
@@ -137,6 +145,58 @@ def compile_module(self, name):
         arguments=["PyObject* tuple", "Py_ssize_t index"],
         resulttype="PyObject*",
     )
+    
+    test_PyTuple_SetItem = CPyExtFunction(
+        _reference_setitem,
+        lambda: (
+            ((1, 2, 3), 1, "a"),
+            (TupleSubclass(1, 2, 3), 1, 5),
+            ((1, 2, 3), -1, []),
+            ((1, 2, 3), 3, str),
+        ),
+        code="""PyObject* wrap_PyTuple_SetItem(PyObject* original, Py_ssize_t index, PyObject* value) {
+            PyObject* tuple = PyTuple_New(PyTuple_Size(original));
+            for (int i = 0; i < PyTuple_Size(original); i++) {
+                PyTuple_SET_ITEM(tuple, i, Py_NewRef(PyTuple_GetItem(original, i)));
+            }
+            if (PyTuple_SetItem(tuple, index, value) == 0) {
+                return Py_NewRef(Py_None);
+            } else {
+                return NULL;
+            }
+        }
+        """,
+        resultspec="O",
+        argspec='OnO',
+        arguments=["PyObject* tuple", "Py_ssize_t index", "PyObject* value"],
+        callfunction="wrap_PyTuple_SetItem",
+        cmpfunc=unhandled_error_compare
+    )
+
+    test_PyTuple_SET_ITEM = CPyExtFunction(
+        lambda args: (None, args[1], None),
+        lambda: (
+            (1, str),
+            (1, 0),
+            (1, "asdf"),
+        ),
+        code="""PyObject* wrap_PyTuple_SET_ITEM(Py_ssize_t index, PyObject* value) {
+            PyObject* tuple = PyTuple_New(3);
+            for (int i = 0; i < PyTuple_Size(tuple); i++) {
+                if (i != index) {
+                    PyTuple_SET_ITEM(tuple, i, Py_NewRef(Py_None));
+                }
+            }
+            PyTuple_SET_ITEM(tuple, index, Py_NewRef(value));
+            return tuple;
+        }
+        """,
+        resultspec="O",
+        argspec='nO',
+        arguments=["Py_ssize_t index", "PyObject* value"],
+        callfunction="wrap_PyTuple_SET_ITEM",
+        cmpfunc=unhandled_error_compare
+    )
 
     # PyTuple_GetSlice
     test_PyTuple_GetSlice = CPyExtFunctionOutVars(
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextBuiltinRegistry.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextBuiltinRegistry.java
@@ -558,12 +558,13 @@ private PythonCextBuiltinRegistry() {
     public static final CApiBuiltinExecutable _PyTruffleObject_MakeTpCall = new CApiBuiltinExecutable("_PyTruffleObject_MakeTpCall", CApiCallPath.Ignored, ArgDescriptor.PyObjectTransfer, new ArgDescriptor[]{ArgDescriptor.PyObject, ArgDescriptor.Pointer, ArgDescriptor.Int, ArgDescriptor.Pointer, ArgDescriptor.Pointer}, 497);
     public static final CApiBuiltinExecutable _PyTruffleSet_NextEntry = new CApiBuiltinExecutable("_PyTruffleSet_NextEntry", CApiCallPath.Ignored, ArgDescriptor.PyObjectTransfer, new ArgDescriptor[]{ArgDescriptor.PyObject, ArgDescriptor.Py_ssize_t}, 498);
     public static final CApiBuiltinExecutable _PyTruffle_HashBytes = new CApiBuiltinExecutable("_PyTruffle_HashBytes", CApiCallPath.Ignored, ArgDescriptor.Py_hash_t, new ArgDescriptor[]{ArgDescriptor.ConstCharPtrAsTruffleString}, 499);
-    public static final CApiBuiltinExecutable _PyType_Lookup = new CApiBuiltinExecutable("_PyType_Lookup", CApiCallPath.Direct, ArgDescriptor.PyObjectBorrowed, new ArgDescriptor[]{ArgDescriptor.PyTypeObject, ArgDescriptor.PyObject}, 500);
-    public static final CApiBuiltinExecutable _PyUnicode_AsASCIIString = new CApiBuiltinExecutable("_PyUnicode_AsASCIIString", CApiCallPath.Direct, ArgDescriptor.PyObjectTransfer, new ArgDescriptor[]{ArgDescriptor.PyObject, ArgDescriptor.ConstCharPtrAsTruffleString}, 501);
-    public static final CApiBuiltinExecutable _PyUnicode_AsLatin1String = new CApiBuiltinExecutable("_PyUnicode_AsLatin1String", CApiCallPath.Direct, ArgDescriptor.PyObjectTransfer, new ArgDescriptor[]{ArgDescriptor.PyObject, ArgDescriptor.ConstCharPtrAsTruffleString}, 502);
-    public static final CApiBuiltinExecutable _PyUnicode_AsUTF8String = new CApiBuiltinExecutable("_PyUnicode_AsUTF8String", CApiCallPath.Direct, ArgDescriptor.PyObjectTransfer, new ArgDescriptor[]{ArgDescriptor.PyObject, ArgDescriptor.ConstCharPtrAsTruffleString}, 503);
-    public static final CApiBuiltinExecutable _PyUnicode_EqualToASCIIString = new CApiBuiltinExecutable("_PyUnicode_EqualToASCIIString", CApiCallPath.Direct, ArgDescriptor.Int, new ArgDescriptor[]{ArgDescriptor.PyObject, ArgDescriptor.ConstCharPtrAsTruffleString}, 504);
-    public static final CApiBuiltinExecutable _Py_HashDouble = new CApiBuiltinExecutable("_Py_HashDouble", CApiCallPath.Direct, ArgDescriptor.Py_hash_t, new ArgDescriptor[]{ArgDescriptor.PyObject, ArgDescriptor.Double}, 505);
+    public static final CApiBuiltinExecutable _PyTuple_SET_ITEM = new CApiBuiltinExecutable("_PyTuple_SET_ITEM", CApiCallPath.Direct, ArgDescriptor.Int, new ArgDescriptor[]{ArgDescriptor.PyObject, ArgDescriptor.Py_ssize_t, ArgDescriptor.PyObjectTransfer}, 500);
+    public static final CApiBuiltinExecutable _PyType_Lookup = new CApiBuiltinExecutable("_PyType_Lookup", CApiCallPath.Direct, ArgDescriptor.PyObjectBorrowed, new ArgDescriptor[]{ArgDescriptor.PyTypeObject, ArgDescriptor.PyObject}, 501);
+    public static final CApiBuiltinExecutable _PyUnicode_AsASCIIString = new CApiBuiltinExecutable("_PyUnicode_AsASCIIString", CApiCallPath.Direct, ArgDescriptor.PyObjectTransfer, new ArgDescriptor[]{ArgDescriptor.PyObject, ArgDescriptor.ConstCharPtrAsTruffleString}, 502);
+    public static final CApiBuiltinExecutable _PyUnicode_AsLatin1String = new CApiBuiltinExecutable("_PyUnicode_AsLatin1String", CApiCallPath.Direct, ArgDescriptor.PyObjectTransfer, new ArgDescriptor[]{ArgDescriptor.PyObject, ArgDescriptor.ConstCharPtrAsTruffleString}, 503);
+    public static final CApiBuiltinExecutable _PyUnicode_AsUTF8String = new CApiBuiltinExecutable("_PyUnicode_AsUTF8String", CApiCallPath.Direct, ArgDescriptor.PyObjectTransfer, new ArgDescriptor[]{ArgDescriptor.PyObject, ArgDescriptor.ConstCharPtrAsTruffleString}, 504);
+    public static final CApiBuiltinExecutable _PyUnicode_EqualToASCIIString = new CApiBuiltinExecutable("_PyUnicode_EqualToASCIIString", CApiCallPath.Direct, ArgDescriptor.Int, new ArgDescriptor[]{ArgDescriptor.PyObject, ArgDescriptor.ConstCharPtrAsTruffleString}, 505);
+    public static final CApiBuiltinExecutable _Py_HashDouble = new CApiBuiltinExecutable("_Py_HashDouble", CApiCallPath.Direct, ArgDescriptor.Py_hash_t, new ArgDescriptor[]{ArgDescriptor.PyObject, ArgDescriptor.Double}, 506);
 
     public static final CApiBuiltinExecutable[] builtins = {
                     PyByteArray_Resize,
@@ -1066,6 +1067,7 @@ private PythonCextBuiltinRegistry() {
                     _PyTruffleObject_MakeTpCall,
                     _PyTruffleSet_NextEntry,
                     _PyTruffle_HashBytes,
+                    _PyTuple_SET_ITEM,
                     _PyType_Lookup,
                     _PyUnicode_AsASCIIString,
                     _PyUnicode_AsLatin1String,
@@ -2077,16 +2079,18 @@ static CApiBuiltinNode createBuiltinNode(int id) {
             case 499:
                 return com.oracle.graal.python.builtins.modules.cext.PythonCextHashBuiltinsFactory._PyTruffle_HashBytesNodeGen.create();
             case 500:
-                return com.oracle.graal.python.builtins.modules.cext.PythonCextTypeBuiltinsFactory._PyType_LookupNodeGen.create();
+                return com.oracle.graal.python.builtins.modules.cext.PythonCextTupleBuiltinsFactory._PyTuple_SET_ITEMNodeGen.create();
             case 501:
-                return com.oracle.graal.python.builtins.modules.cext.PythonCextUnicodeBuiltinsFactory._PyUnicode_AsASCIIStringNodeGen.create();
+                return com.oracle.graal.python.builtins.modules.cext.PythonCextTypeBuiltinsFactory._PyType_LookupNodeGen.create();
             case 502:
-                return com.oracle.graal.python.builtins.modules.cext.PythonCextUnicodeBuiltinsFactory._PyUnicode_AsLatin1StringNodeGen.create();
+                return com.oracle.graal.python.builtins.modules.cext.PythonCextUnicodeBuiltinsFactory._PyUnicode_AsASCIIStringNodeGen.create();
             case 503:
-                return com.oracle.graal.python.builtins.modules.cext.PythonCextUnicodeBuiltinsFactory._PyUnicode_AsUTF8StringNodeGen.create();
+                return com.oracle.graal.python.builtins.modules.cext.PythonCextUnicodeBuiltinsFactory._PyUnicode_AsLatin1StringNodeGen.create();
             case 504:
-                return com.oracle.graal.python.builtins.modules.cext.PythonCextUnicodeBuiltinsFactory._PyUnicode_EqualToASCIIStringNodeGen.create();
+                return com.oracle.graal.python.builtins.modules.cext.PythonCextUnicodeBuiltinsFactory._PyUnicode_AsUTF8StringNodeGen.create();
             case 505:
+                return com.oracle.graal.python.builtins.modules.cext.PythonCextUnicodeBuiltinsFactory._PyUnicode_EqualToASCIIStringNodeGen.create();
+            case 506:
                 return com.oracle.graal.python.builtins.modules.cext.PythonCextHashBuiltinsFactory._Py_HashDoubleNodeGen.create();
         }
         return null;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextTupleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextTupleBuiltins.java
@@ -62,11 +62,14 @@
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.ListGeneralizationNode;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.SetItemNode;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.SetItemScalarNode;
+import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodesFactory.GetItemNodeGen;
+import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodesFactory.GetItemScalarNodeGen;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.lib.PySliceNew;
 import com.oracle.graal.python.lib.PyTupleSizeNode;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.builtins.TupleNodes.GetNativeTupleStorage;
+import com.oracle.graal.python.runtime.sequence.storage.NativeSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
@@ -89,9 +92,55 @@ PTuple doGeneric(long size) {
     abstract static class PyTuple_SetItem extends CApiTernaryBuiltinNode {
         @Specialization
         int doManaged(PTuple tuple, long index, Object element,
-                        @Shared("setItem") @Cached("createSetItem()") SequenceStorageNodes.SetItemNode setItemNode,
+                        @Cached("createSetItem()") SequenceStorageNodes.SetItemNode setItemNode,
                         @Cached ConditionProfile generalizedProfile) {
-            SequenceStorage newStorage = setItem(tuple.getSequenceStorage(), index, element, setItemNode);
+            SequenceStorage sequenceStorage = tuple.getSequenceStorage();
+            checkBounds(sequenceStorage, index);
+            SequenceStorage newStorage = setItemNode.execute(null, sequenceStorage, (int) index, element);
+            if (generalizedProfile.profile(tuple.getSequenceStorage() != newStorage)) {
+                tuple.setSequenceStorage(newStorage);
+            }
+            return 0;
+        }
+
+        @Specialization
+        int doNative(PythonAbstractNativeObject tuple, long index, Object element,
+                        @Cached GetNativeTupleStorage asNativeStorage,
+                        @Cached SequenceStorageNodes.SetNativeItemScalarNode setItemNode) {
+            NativeSequenceStorage sequenceStorage = asNativeStorage.execute(tuple);
+            checkBounds(sequenceStorage, index);
+            setItemNode.execute(sequenceStorage, (int) index, element);
+            return 0;
+        }
+
+        @Fallback
+        @SuppressWarnings("unused")
+        Object fallback(Object tuple, Object index, Object element) {
+            throw raiseFallback(tuple, PythonBuiltinClassType.PTuple);
+        }
+
+        private void checkBounds(SequenceStorage sequenceStorage, long index) {
+            // we must do a bounds-check but we must not normalize the index
+            if (index < 0 || index >= sequenceStorage.length()) {
+                throw raise(IndexError, ErrorMessages.TUPLE_OUT_OF_BOUNDS);
+            }
+        }
+
+        protected static SetItemNode createSetItem() {
+            return SetItemNode.create(null, ListGeneralizationNode::create);
+        }
+    }
+
+    @CApiBuiltin(ret = Int, args = {PyObject, Py_ssize_t, PyObjectTransfer}, call = Direct)
+    abstract static class _PyTuple_SET_ITEM extends CApiTernaryBuiltinNode {
+        @Specialization
+        int doManaged(PTuple tuple, long index, Object element,
+                        @Cached("createSetItem()") SequenceStorageNodes.SetItemNode setItemNode,
+                        @Cached ConditionProfile generalizedProfile) {
+            assert GetItemScalarNodeGen.getUncached().execute(tuple.getSequenceStorage(), (int) index) == null;
+            SequenceStorage sequenceStorage = tuple.getSequenceStorage();
+            checkBounds(sequenceStorage, index);
+            SequenceStorage newStorage = setItemNode.execute(null, sequenceStorage, (int) index, element);
             if (generalizedProfile.profile(tuple.getSequenceStorage() != newStorage)) {
                 tuple.setSequenceStorage(newStorage);
             }
@@ -101,8 +150,10 @@ int doManaged(PTuple tuple, long index, Object element,
         @Specialization
         int doNative(PythonAbstractNativeObject tuple, long index, Object element,
                         @Cached GetNativeTupleStorage asNativeStorage,
-                        @Shared("setItem") @Cached("createSetItem()") SequenceStorageNodes.SetItemNode setItemNode) {
-            setItem(asNativeStorage.execute(tuple), index, element, setItemNode);
+                        @Cached SequenceStorageNodes.InitializeNativeItemScalarNode setItemNode) {
+            NativeSequenceStorage sequenceStorage = asNativeStorage.execute(tuple);
+            checkBounds(sequenceStorage, index);
+            setItemNode.execute(sequenceStorage, (int) index, element);
             return 0;
         }
 
@@ -112,12 +163,11 @@ Object fallback(Object tuple, Object index, Object element) {
             throw raiseFallback(tuple, PythonBuiltinClassType.PTuple);
         }
 
-        private SequenceStorage setItem(SequenceStorage sequenceStorage, long index, Object element, SetItemNode setItemNode) {
+        private void checkBounds(SequenceStorage sequenceStorage, long index) {
             // we must do a bounds-check but we must not normalize the index
             if (index < 0 || index >= sequenceStorage.length()) {
                 throw raise(IndexError, ErrorMessages.TUPLE_OUT_OF_BOUNDS);
             }
-            return setItemNode.execute(null, sequenceStorage, (int) index, element);
         }
 
         protected static SetItemNode createSetItem() {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CApiCodeGen.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CApiCodeGen.java
@@ -543,7 +543,7 @@ public static boolean assertBuiltins(Object capiLibrary) {
                     "PyMethodDescrObject_GetMethod", "PyObject_GetDoc", "PyObject_SetDoc", "PySlice_Start", "PySlice_Step", "PySlice_Stop", "_PyASCIIObject_LENGTH", "_PyASCIIObject_STATE_ASCII",
                     "_PyASCIIObject_STATE_COMPACT", "_PyASCIIObject_STATE_KIND", "_PyASCIIObject_STATE_READY", "_PyASCIIObject_WSTR", "_PyByteArray_Start", "_PyEval_SetCoroutineOriginTrackingDepth",
                     "_PyFrame_SetLineNumber", "_PyMemoryView_GetBuffer", "_PySequence_Fast_ITEMS", "_PySequence_ITEM", "_PyUnicodeObject_DATA", "_PyUnicode_get_wstr_length", "_Py_REFCNT",
-                    "_Py_SET_REFCNT", "_Py_SET_SIZE", "_Py_SET_TYPE", "_Py_SIZE", "_Py_TYPE"};
+                    "_Py_SET_REFCNT", "_Py_SET_SIZE", "_Py_SET_TYPE", "_Py_SIZE", "_Py_TYPE", "_PyTuple_SET_ITEM"};
 
     /**
      * Check the list of implemented and unimplemented builtins against the list of CPython exported
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeCAPISymbol.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeCAPISymbol.java
@@ -156,6 +156,7 @@ public enum NativeCAPISymbol implements NativeCExtSymbol {
     FUN_PY_TRUFFLE_PRIMITIVE_ARRAY_FREE("PyTruffle_PrimitiveArrayFree"),
     FUN_PY_TRUFFLE_OBJECT_ARRAY_FREE("PyTruffle_ObjectArrayFree"),
     FUN_PY_TRUFFLE_SET_STORAGE_ITEM("PyTruffle_SetStorageItem"),
+    FUN_PY_TRUFFLE_INITIALIZE_STORAGE_ITEM("PyTruffle_InitializeStorageItem"),
     FUN_PY_TRUFFLE_NATIVE_TUPLE_ITEMS("PyTruffle_NativeTupleItems"),
     FUN_PY_OBJECT_GENERIC_GET_DICT("_PyObject_GenericGetDict"),
     FUN_PY_OBJECT_NEW("PyTruffle_Object_New"),
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/transitions/CApiTransitions.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/transitions/CApiTransitions.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ PyObject * tuple_subtype_new(PyTypeObject type, PyObject iterable) {`
`88`	`88`	`for (i = 0; i < n; i++) {`
`89`	`89`	`item = PyTuple_GetItem(tmp, i);`
`90`	`90`	`Py_INCREF(item);`
`91`		`- PyTuple_SetItem((PyObject*)newobj, i, item);`
	`91`	`+ newobj->ob_item[i] = item; // PyTuple_SETITEM`
`92`	`92`	`}`
`93`	`93`	`Py_DECREF(tmp);`
`94`	`94`	`return (PyObject*) newobj;`