Nuitka-winsvc 2.2.3__cp311-cp311-win_amd64.whl → 2.3.2__cp311-cp311-win_amd64.whl

nuitka/build/include/nuitka/exception_groups.h

@@ -82,9 +82,9 @@ NUITKA_MAY_BE_UNUSED static int EXCEPTION_GROUP_MATCH(PyThreadState *tstate, PyO
     // TODO: Avoid this from happening, we should not call it then.
     if (exc_value == Py_None) {
         *match = Py_None;
-        Py_INCREF(*match);
+        Py_INCREF_IMMORTAL(*match);
         *rest = Py_None;
-        Py_INCREF(*rest);
+        Py_INCREF_IMMORTAL(*rest);
 
         return 0;
     }
@@ -100,7 +100,7 @@ NUITKA_MAY_BE_UNUSED static int EXCEPTION_GROUP_MATCH(PyThreadState *tstate, PyO
             Py_INCREF(*match);
         } else {
             // Old style plain exception, put it into an exception group.
-            PyObject *exception_tuple = MAKE_TUPLE1_0(exc_value);
+            PyObject *exception_tuple = MAKE_TUPLE1_0(tstate, exc_value);
             PyObject *wrapped = _PyExc_CreateExceptionGroup("", exception_tuple);
             Py_DECREF(exception_tuple);
 
@@ -112,7 +112,7 @@ NUITKA_MAY_BE_UNUSED static int EXCEPTION_GROUP_MATCH(PyThreadState *tstate, PyO
         }
 
         *rest = Py_None;
-        Py_INCREF(*rest);
+        Py_INCREF_IMMORTAL(*rest);
 
         return 0;
     }
@@ -142,10 +142,10 @@ NUITKA_MAY_BE_UNUSED static int EXCEPTION_GROUP_MATCH(PyThreadState *tstate, PyO
     }
 
     *match = Py_None;
-    Py_INCREF(*match);
+    Py_INCREF_IMMORTAL(*match);
 
     *rest = Py_None;
-    Py_INCREF(*rest);
+    Py_INCREF_IMMORTAL(*rest);
 
     return 0;
 }

nuitka/build/include/nuitka/exceptions.h

@@ -535,7 +535,7 @@ NUITKA_MAY_BE_UNUSED static inline void PRESERVE_FRAME_EXCEPTION(PyThreadState *
             PRINT_STRING("PRESERVE_FRAME_EXCEPTION: no exception to preserve\n");
 #endif
             frame->f_exc_type = Py_None;
-            Py_INCREF(frame->f_exc_type);
+            Py_INCREF_IMMORTAL(frame->f_exc_type);
             frame->f_exc_value = NULL;
             frame->f_exc_traceback = NULL;
         }
@@ -751,7 +751,7 @@ extern void FORMAT_UNBOUND_CLOSURE_ERROR(PyObject **exception_type, PyObject **e
                                          PyObject *variable_name);
 
 #if PYTHON_VERSION >= 0x3c0
-NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE1(PyObject *element1);
+NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE1(PyThreadState *tstate, PyObject *element1);
 
 NUITKA_MAY_BE_UNUSED static PyObject *MAKE_EXCEPTION_FROM_TYPE_ARG0(PyThreadState *tstate, PyObject *type,
                                                                     PyObject *arg) {
@@ -769,7 +769,7 @@ NUITKA_MAY_BE_UNUSED static PyObject *MAKE_EXCEPTION_FROM_TYPE_ARG0(PyThreadStat
     assert(arg != NULL);
 
     if (!PyTuple_Check(arg)) {
-        self->args = MAKE_TUPLE1(arg);
+        self->args = MAKE_TUPLE1(tstate, arg);
     } else {
         self->args = Py_NewRef(arg);
     }

nuitka/build/include/nuitka/freelists.h

@@ -63,6 +63,17 @@ static const bool use_freelists = true;
         free_list##_count += 1;                                                                                        \
     }
 
+#if PYTHON_VERSION >= 0x3d0
+NUITKA_MAY_BE_UNUSED static inline struct _Py_object_freelists *_Nuitka_object_freelists_GET(PyThreadState *tstate) {
+
+#ifdef Py_GIL_DISABLED
+    return &((_PyThreadStateImpl *)tstate)->freelists;
+#else
+    return &tstate->interp->object_state.freelists;
+#endif
+}
+#endif
+
 #endif
 
 //     Part of "Nuitka", an optimizing Python compiler that is compatible and

nuitka/build/include/nuitka/helper/dictionaries.h

@@ -388,7 +388,7 @@ extern PyObject *DICT_VIEWVALUES(PyObject *dict);
 extern PyObject *DICT_VIEWITEMS(PyObject *dict);
 
 // Python dictionary copy, return a shallow copy of a dictionary.
-extern PyObject *DICT_COPY(PyObject *dict);
+extern PyObject *DICT_COPY(PyThreadState *tstate, PyObject *dict);
 
 // Python dictionary clear, empties the dictionary.
 extern void DICT_CLEAR(PyObject *dict);
@@ -396,14 +396,15 @@ extern void DICT_CLEAR(PyObject *dict);
 // Replacement for PyDict_Next that is faster (to call).
 extern bool Nuitka_DictNext(PyObject *dict, Py_ssize_t *pos, PyObject **key_ptr, PyObject **value_ptr);
 
-#if PYTHON_VERSION >= 0x3a0 && !defined(_NUITKA_EXPERIMENTAL_DISABLE_FREELIST_ALL)
+#if PYTHON_VERSION >= 0x3a0 && !defined(_NUITKA_EXPERIMENTAL_DISABLE_FREELIST_ALL) &&                                  \
+    !defined(_NUITKA_EXPERIMENTAL_DISABLE_FREELIST_DICT)
 #define NUITKA_DICT_HAS_FREELIST 1
 
 // Replacement for PyDict_New that is faster
-extern PyObject *MAKE_DICT_EMPTY(void);
+extern PyObject *MAKE_DICT_EMPTY(PyThreadState *tstate);
 #else
 #define NUITKA_DICT_HAS_FREELIST 0
-#define MAKE_DICT_EMPTY PyDict_New
+#define MAKE_DICT_EMPTY(tstate) PyDict_New()
 #endif
 
 // Create a dictionary from key/value pairs.

nuitka/build/include/nuitka/helper/lists.h

@@ -17,11 +17,11 @@
 
 #if PYTHON_VERSION >= 0x3a0
 #define NUITKA_LIST_HAS_FREELIST 1
-extern PyObject *MAKE_LIST_EMPTY(Py_ssize_t size);
+extern PyObject *MAKE_LIST_EMPTY(PyThreadState *tstate, Py_ssize_t size);
 #else
 #define NUITKA_LIST_HAS_FREELIST 0
 
-#define MAKE_LIST_EMPTY(size) PyList_New(size)
+#define MAKE_LIST_EMPTY(tstate, size) PyList_New(size)
 #endif
 
 extern bool LIST_EXTEND_FROM_ITERABLE(PyThreadState *tstate, PyObject *list, PyObject *other);
@@ -41,7 +41,7 @@ extern void LIST_CLEAR(PyObject *target);
 extern void LIST_REVERSE(PyObject *list);
 
 // Like list.copy
-extern PyObject *LIST_COPY(PyObject *list);
+extern PyObject *LIST_COPY(PyThreadState *tstate, PyObject *list);
 
 // Like list.count
 extern PyObject *LIST_COUNT(PyObject *list, PyObject *item);
@@ -60,8 +60,8 @@ extern PyObject *MAKE_LIST(PyThreadState *tstate, PyObject *iterable);
 
 extern bool LIST_EXTEND_FROM_LIST(PyObject *list, PyObject *other);
 
-NUITKA_MAY_BE_UNUSED static PyObject *MAKE_LIST_REPEATED(Py_ssize_t size, PyObject *element) {
-    PyObject *result = MAKE_LIST_EMPTY(size);
+NUITKA_MAY_BE_UNUSED static PyObject *MAKE_LIST_REPEATED(PyThreadState *tstate, Py_ssize_t size, PyObject *element) {
+    PyObject *result = MAKE_LIST_EMPTY(tstate, size);
 
     if (unlikely(result == NULL)) {
         return NULL;

nuitka/build/include/nuitka/helper/lists_generated.h

@@ -7,18 +7,18 @@
 #include "nuitka/prelude.h"
 #endif
 
-extern PyObject *MAKE_LIST1(PyObject *arg0);
-extern PyObject *MAKE_LIST2(PyObject *arg0, PyObject *arg1);
-extern PyObject *MAKE_LIST3(PyObject *arg0, PyObject *arg1, PyObject *arg2);
-extern PyObject *MAKE_LIST4(PyObject *list);
-extern PyObject *MAKE_LIST5(PyObject *list);
-extern PyObject *MAKE_LIST6(PyObject *list);
-extern PyObject *MAKE_LIST7(PyObject *list);
-extern PyObject *MAKE_LIST8(PyObject *list);
-extern PyObject *MAKE_LIST9(PyObject *list);
-extern PyObject *MAKE_LIST10(PyObject *list);
-extern PyObject *MAKE_LIST11(PyObject *list);
-extern PyObject *MAKE_LIST12(PyObject *list);
+extern PyObject *MAKE_LIST1(PyThreadState *tstate, PyObject *arg0);
+extern PyObject *MAKE_LIST2(PyThreadState *tstate, PyObject *arg0, PyObject *arg1);
+extern PyObject *MAKE_LIST3(PyThreadState *tstate, PyObject *arg0, PyObject *arg1, PyObject *arg2);
+extern PyObject *MAKE_LIST4(PyThreadState *tstate, PyObject *list);
+extern PyObject *MAKE_LIST5(PyThreadState *tstate, PyObject *list);
+extern PyObject *MAKE_LIST6(PyThreadState *tstate, PyObject *list);
+extern PyObject *MAKE_LIST7(PyThreadState *tstate, PyObject *list);
+extern PyObject *MAKE_LIST8(PyThreadState *tstate, PyObject *list);
+extern PyObject *MAKE_LIST9(PyThreadState *tstate, PyObject *list);
+extern PyObject *MAKE_LIST10(PyThreadState *tstate, PyObject *list);
+extern PyObject *MAKE_LIST11(PyThreadState *tstate, PyObject *list);
+extern PyObject *MAKE_LIST12(PyThreadState *tstate, PyObject *list);
 
 //     Part of "Nuitka", an optimizing Python compiler that is compatible and
 //     integrates with CPython, but also works on its own.

nuitka/build/include/nuitka/helper/sequences.h

@@ -9,6 +9,12 @@ extern bool SEQUENCE_SET_ITEM(PyObject *sequence, Py_ssize_t index, PyObject *va
 
 extern Py_ssize_t Nuitka_PyObject_Size(PyObject *sequence);
 
+// Our version of "_PyObject_HasLen", a former API function.
+NUITKA_MAY_BE_UNUSED static int Nuitka_PyObject_HasLen(PyObject *o) {
+    return (Py_TYPE(o)->tp_as_sequence && Py_TYPE(o)->tp_as_sequence->sq_length) ||
+           (Py_TYPE(o)->tp_as_mapping && Py_TYPE(o)->tp_as_mapping->mp_length);
+}
+
 #endif
 
 //     Part of "Nuitka", an optimizing Python compiler that is compatible and

nuitka/build/include/nuitka/helper/slices.h

@@ -3,30 +3,36 @@
 #ifndef __NUITKA_HELPER_SLICES_H__
 #define __NUITKA_HELPER_SLICES_H__
 
+/* This file is included from another C file, help IDEs to still parse it on its own. */
+#ifdef __IDE_ONLY__
+#include "nuitka/prelude.h"
+#endif
+
 #if PYTHON_VERSION >= 0x3a0
-extern PyObject *Nuitka_Slice_New(PyObject *start, PyObject *stop, PyObject *step);
+extern PyObject *Nuitka_Slice_New(PyThreadState *tstate, PyObject *start, PyObject *stop, PyObject *step);
 #else
-#define Nuitka_Slice_New PySlice_New
+#define Nuitka_Slice_New(tstate, start, stop, step) PySlice_New(start, stop, step)
 #endif
 
 // Note: Cannot these cannot fail, PySlice_New does not return errors.
-NUITKA_MAY_BE_UNUSED static PyObject *MAKE_SLICE_OBJECT3(PyObject *start, PyObject *stop, PyObject *step) {
+NUITKA_MAY_BE_UNUSED static PyObject *MAKE_SLICE_OBJECT3(PyThreadState *tstate, PyObject *start, PyObject *stop,
+                                                         PyObject *step) {
     CHECK_OBJECT(start);
     CHECK_OBJECT(stop);
     CHECK_OBJECT(step);
 
-    return Nuitka_Slice_New(start, stop, step);
+    return Nuitka_Slice_New(tstate, start, stop, step);
 }
-NUITKA_MAY_BE_UNUSED static PyObject *MAKE_SLICE_OBJECT2(PyObject *start, PyObject *stop) {
+NUITKA_MAY_BE_UNUSED static PyObject *MAKE_SLICE_OBJECT2(PyThreadState *tstate, PyObject *start, PyObject *stop) {
     CHECK_OBJECT(start);
     CHECK_OBJECT(stop);
 
-    return Nuitka_Slice_New(start, stop, Py_None);
+    return Nuitka_Slice_New(tstate, start, stop, Py_None);
 }
-NUITKA_MAY_BE_UNUSED static PyObject *MAKE_SLICE_OBJECT1(PyObject *stop) {
+NUITKA_MAY_BE_UNUSED static PyObject *MAKE_SLICE_OBJECT1(PyThreadState *tstate, PyObject *stop) {
     CHECK_OBJECT(stop);
 
-    return Nuitka_Slice_New(Py_None, stop, Py_None);
+    return Nuitka_Slice_New(tstate, Py_None, stop, Py_None);
 }
 
 #if PYTHON_VERSION < 0x300

nuitka/build/include/nuitka/helper/subscripts.h

@@ -238,190 +238,7 @@ NUITKA_MAY_BE_UNUSED static PyObject *LOOKUP_SUBSCRIPT(PyThreadState *tstate, Py
 #endif
 }
 
-NUITKA_MAY_BE_UNUSED static bool HAS_SUBSCRIPT_CONST(PyThreadState *tstate, PyObject *source, PyObject *const_subscript,
-                                                     Py_ssize_t int_subscript) {
-    CHECK_OBJECT(source);
-    CHECK_OBJECT(const_subscript);
-
-#if _NUITKA_EXPERIMENTAL_DISABLE_SUBSCRIPT_OPT
-    PyObject *item = PyObject_GetItem(source, const_subscript);
-
-    if (item) {
-        Py_DECREF(item);
-        return true;
-    } else {
-        return false;
-    }
-#else
-    PyTypeObject *type = Py_TYPE(source);
-    PyMappingMethods *tp_as_mapping = type->tp_as_mapping;
-
-    if (tp_as_mapping && tp_as_mapping->mp_subscript) {
-        if (PyList_CheckExact(source)) {
-            Py_ssize_t list_size = PyList_GET_SIZE(source);
-
-            if (int_subscript < 0) {
-                if (-int_subscript > list_size) {
-                    return false;
-                }
-
-                int_subscript += list_size;
-            } else {
-                if (int_subscript >= list_size) {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-#if PYTHON_VERSION < 0x300
-        else if (PyString_CheckExact(source)) {
-            Py_ssize_t string_size = PyString_GET_SIZE(source);
-
-            if (int_subscript < 0) {
-                if (-int_subscript > string_size) {
-                    return false;
-                }
-
-                int_subscript += string_size;
-            } else {
-                if (int_subscript >= string_size) {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-#else
-        else if (PyUnicode_CheckExact(source)) {
-            if (int_subscript < 0) {
-                int_subscript += PyUnicode_GET_LENGTH(source);
-            }
-
-            PyObject *result = type->tp_as_sequence->sq_item(source, int_subscript);
-
-            bool bool_result = !DROP_ERROR_OCCURRED(tstate);
-
-            Py_XDECREF(result);
-            return bool_result;
-        }
-#endif
-        else {
-            PyObject *result = tp_as_mapping->mp_subscript(source, const_subscript);
-
-            bool bool_result = !DROP_ERROR_OCCURRED(tstate);
-
-            Py_XDECREF(result);
-
-            return bool_result;
-        }
-    } else if (type->tp_as_sequence) {
-        PyObject *result = SEQUENCE_GET_ITEM_CONST(source, int_subscript);
-
-        bool bool_result = !DROP_ERROR_OCCURRED(tstate);
-
-        Py_XDECREF(result);
-        return bool_result;
-    } else {
-#if PYTHON_VERSION >= 0x370
-        if (PyType_Check(source)) {
-#if PYTHON_VERSION >= 0x390
-            if (source == (PyObject *)&PyType_Type) {
-                return true;
-            }
-#endif
-
-            PyObject *meth = LOOKUP_ATTRIBUTE(tstate, source, const_str_plain___class_getitem__);
-
-            if (meth) {
-                PyObject *subscript = PyLong_FromSsize_t(int_subscript);
-                PyObject *result = CALL_FUNCTION_WITH_SINGLE_ARG(tstate, meth, subscript);
-                Py_DECREF(meth);
-                Py_DECREF(subscript);
-
-                bool bool_result = !DROP_ERROR_OCCURRED(tstate);
-
-                Py_XDECREF(result);
-                return bool_result;
-            }
-        }
-#endif
-
-        return false;
-    }
-
-    return false;
-
-#endif
-}
-
-NUITKA_MAY_BE_UNUSED static bool HAS_SUBSCRIPT(PyThreadState *tstate, PyObject *source, PyObject *subscript) {
-    CHECK_OBJECT(source);
-    CHECK_OBJECT(subscript);
-
-#if _NUITKA_EXPERIMENTAL_DISABLE_SUBSCRIPT_OPT
-    PyObject *item = PyObject_GetItem(source, subscript);
-
-    if (item) {
-        Py_DECREF(item);
-        return true;
-    } else {
-        return false;
-    }
-#else
-    PyTypeObject *type = Py_TYPE(source);
-    PyMappingMethods *tp_as_mapping = type->tp_as_mapping;
-
-    if (tp_as_mapping != NULL && tp_as_mapping->mp_subscript != NULL) {
-        PyObject *result = tp_as_mapping->mp_subscript(source, subscript);
-        bool bool_result = !DROP_ERROR_OCCURRED(tstate);
-
-        Py_XDECREF(result);
-        return bool_result;
-    } else if (type->tp_as_sequence != NULL) {
-        if (Nuitka_Index_Check(subscript)) {
-            Py_ssize_t index = PyNumber_AsSsize_t(subscript, NULL);
-
-            if (index == -1 && HAS_ERROR_OCCURRED(tstate)) {
-                return false;
-            }
-
-            PyObject *result = SEQUENCE_GET_ITEM_CONST(source, index);
-            bool bool_result = !DROP_ERROR_OCCURRED(tstate);
-
-            Py_XDECREF(result);
-            return bool_result;
-        } else if (type->tp_as_sequence->sq_item) {
-            return false;
-#if PYTHON_VERSION < 0x370
-        } else {
-            return false;
-#endif
-        }
-    }
-
-#if PYTHON_VERSION >= 0x370
-    if (PyType_Check(source)) {
-#if PYTHON_VERSION >= 0x390
-        if (source == (PyObject *)&PyType_Type) {
-            return true;
-        }
-#endif
-        PyObject *meth = LOOKUP_ATTRIBUTE(tstate, source, const_str_plain___class_getitem__);
-
-        if (meth) {
-            PyObject *result = CALL_FUNCTION_WITH_SINGLE_ARG(tstate, meth, subscript);
-            bool bool_result = !DROP_ERROR_OCCURRED(tstate);
-
-            Py_XDECREF(result);
-            return bool_result;
-        }
-    }
-#endif
-
-    return false;
-#endif
-}
+int MATCH_MAPPING_KEY(PyThreadState *tstate, PyObject *map, PyObject *key);
 
 NUITKA_MAY_BE_UNUSED static bool SET_SUBSCRIPT_CONST(PyThreadState *tstate, PyObject *target, PyObject *subscript,
                                                      Py_ssize_t int_subscript, PyObject *value) {

nuitka/build/include/nuitka/helper/tuples.h

@@ -3,7 +3,7 @@
 #ifndef __NUITKA_HELPER_TUPLES_H__
 #define __NUITKA_HELPER_TUPLES_H__
 
-// Like PyTuple_SET_ITEM but takes a reference to the item.
+// Like PyTuple_SET_ITEM, but takes a reference to the item.
 #define PyTuple_SET_ITEM0(tuple, index, value)                                                                         \
     {                                                                                                                  \
         PyObject *tmp = value;                                                                                         \
@@ -11,23 +11,30 @@
         PyTuple_SET_ITEM(tuple, index, tmp);                                                                           \
     }
 
+// Like PyTuple_SET_ITEM, but takes a reference to the immortal value pre 3.12
+#if PYTHON_VERSION < 0x3c0
+#define PyTuple_SET_ITEM_IMMORTAL(tuple, index, value) PyTuple_SET_ITEM0(tuple, index, value)
+#else
+#define PyTuple_SET_ITEM_IMMORTAL(tuple, index, value) PyTuple_SET_ITEM(tuple, index, value)
+#endif
+
 #if PYTHON_VERSION >= 0x3a0 && !defined(_NUITKA_EXPERIMENTAL_DISABLE_FREELIST_ALL)
 #define NUITKA_TUPLE_HAS_FREELIST 1
 // Make empty tuple, size > 0
-extern PyObject *MAKE_TUPLE_EMPTY(Py_ssize_t size);
+extern PyObject *MAKE_TUPLE_EMPTY(PyThreadState *tstate, Py_ssize_t size);
 // Make empty tuple, size >= 0
-extern PyObject *MAKE_TUPLE_EMPTY_VAR(Py_ssize_t size);
+extern PyObject *MAKE_TUPLE_EMPTY_VAR(PyThreadState *tstate, Py_ssize_t size);
 #else
 #define NUITKA_TUPLE_HAS_FREELIST 0
 
 // Make empty tuple, size > 0
-#define MAKE_TUPLE_EMPTY(size) PyTuple_New(size)
+#define MAKE_TUPLE_EMPTY(tstate, size) PyTuple_New(size)
 // Make empty tuple, size >= 0
-#define MAKE_TUPLE_EMPTY_VAR(size) PyTuple_New(size)
+#define MAKE_TUPLE_EMPTY_VAR(tstate, size) PyTuple_New(size)
 #endif
 
-NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE(PyObject *const *elements, Py_ssize_t size) {
-    PyObject *result = MAKE_TUPLE_EMPTY(size);
+NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE(PyThreadState *tstate, PyObject *const *elements, Py_ssize_t size) {
+    PyObject *result = MAKE_TUPLE_EMPTY(tstate, size);
 
     for (Py_ssize_t i = 0; i < size; i++) {
         PyTuple_SET_ITEM0(result, i, elements[i]);
@@ -36,24 +43,24 @@ NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE(PyObject *const *elements, Py_s
     return result;
 }
 
-NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE1(PyObject *element1) {
-    PyObject *result = MAKE_TUPLE_EMPTY(1);
+NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE1(PyThreadState *tstate, PyObject *element1) {
+    PyObject *result = MAKE_TUPLE_EMPTY(tstate, 1);
 
     PyTuple_SET_ITEM0(result, 0, element1);
 
     return result;
 }
 
-NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE1_0(PyObject *element1) {
-    PyObject *result = MAKE_TUPLE_EMPTY(1);
+NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE1_0(PyThreadState *tstate, PyObject *element1) {
+    PyObject *result = MAKE_TUPLE_EMPTY(tstate, 1);
 
     PyTuple_SET_ITEM(result, 0, element1);
 
     return result;
 }
 
-NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE2(PyObject *element1, PyObject *element2) {
-    PyObject *result = MAKE_TUPLE_EMPTY(2);
+NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE2(PyThreadState *tstate, PyObject *element1, PyObject *element2) {
+    PyObject *result = MAKE_TUPLE_EMPTY(tstate, 2);
 
     PyTuple_SET_ITEM0(result, 0, element1);
     PyTuple_SET_ITEM0(result, 1, element2);
@@ -61,8 +68,8 @@ NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE2(PyObject *element1, PyObject *
     return result;
 }
 
-NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE2_0(PyObject *element1, PyObject *element2) {
-    PyObject *result = MAKE_TUPLE_EMPTY(2);
+NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE2_0(PyThreadState *tstate, PyObject *element1, PyObject *element2) {
+    PyObject *result = MAKE_TUPLE_EMPTY(tstate, 2);
 
     PyTuple_SET_ITEM(result, 0, element1);
     PyTuple_SET_ITEM(result, 1, element2);
@@ -70,8 +77,9 @@ NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE2_0(PyObject *element1, PyObject
     return result;
 }
 
-NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE3(PyObject *element1, PyObject *element2, PyObject *element3) {
-    PyObject *result = MAKE_TUPLE_EMPTY(3);
+NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE3(PyThreadState *tstate, PyObject *element1, PyObject *element2,
+                                                  PyObject *element3) {
+    PyObject *result = MAKE_TUPLE_EMPTY(tstate, 3);
 
     PyTuple_SET_ITEM0(result, 0, element1);
     PyTuple_SET_ITEM0(result, 1, element2);
@@ -80,8 +88,9 @@ NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE3(PyObject *element1, PyObject *
     return result;
 }
 
-NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE3_0(PyObject *element1, PyObject *element2, PyObject *element3) {
-    PyObject *result = MAKE_TUPLE_EMPTY(3);
+NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE3_0(PyThreadState *tstate, PyObject *element1, PyObject *element2,
+                                                    PyObject *element3) {
+    PyObject *result = MAKE_TUPLE_EMPTY(tstate, 3);
 
     PyTuple_SET_ITEM(result, 0, element1);
     PyTuple_SET_ITEM(result, 1, element2);
@@ -90,9 +99,9 @@ NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE3_0(PyObject *element1, PyObject
     return result;
 }
 
-NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE4(PyObject *element1, PyObject *element2, PyObject *element3,
-                                                  PyObject *element4) {
-    PyObject *result = MAKE_TUPLE_EMPTY(4);
+NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE4(PyThreadState *tstate, PyObject *element1, PyObject *element2,
+                                                  PyObject *element3, PyObject *element4) {
+    PyObject *result = MAKE_TUPLE_EMPTY(tstate, 4);
 
     PyTuple_SET_ITEM0(result, 0, element1);
     PyTuple_SET_ITEM0(result, 1, element2);
@@ -102,9 +111,9 @@ NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE4(PyObject *element1, PyObject *
     return result;
 }
 
-NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE4_0(PyObject *element1, PyObject *element2, PyObject *element3,
-                                                    PyObject *element4) {
-    PyObject *result = MAKE_TUPLE_EMPTY(4);
+NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE4_0(PyThreadState *tstate, PyObject *element1, PyObject *element2,
+                                                    PyObject *element3, PyObject *element4) {
+    PyObject *result = MAKE_TUPLE_EMPTY(tstate, 4);
 
     PyTuple_SET_ITEM(result, 0, element1);
     PyTuple_SET_ITEM(result, 1, element2);
@@ -114,9 +123,9 @@ NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE4_0(PyObject *element1, PyObject
     return result;
 }
 
-NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE5(PyObject *element1, PyObject *element2, PyObject *element3,
-                                                  PyObject *element4, PyObject *element5) {
-    PyObject *result = MAKE_TUPLE_EMPTY(5);
+NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE5(PyThreadState *tstate, PyObject *element1, PyObject *element2,
+                                                  PyObject *element3, PyObject *element4, PyObject *element5) {
+    PyObject *result = MAKE_TUPLE_EMPTY(tstate, 5);
 
     PyTuple_SET_ITEM0(result, 0, element1);
     PyTuple_SET_ITEM0(result, 1, element2);
@@ -127,9 +136,9 @@ NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE5(PyObject *element1, PyObject *
     return result;
 }
 
-NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE5_0(PyObject *element1, PyObject *element2, PyObject *element3,
-                                                    PyObject *element4, PyObject *element5) {
-    PyObject *result = MAKE_TUPLE_EMPTY(5);
+NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE5_0(PyThreadState *tstate, PyObject *element1, PyObject *element2,
+                                                    PyObject *element3, PyObject *element4, PyObject *element5) {
+    PyObject *result = MAKE_TUPLE_EMPTY(tstate, 5);
 
     PyTuple_SET_ITEM(result, 0, element1);
     PyTuple_SET_ITEM(result, 1, element2);
@@ -145,9 +154,9 @@ NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE5_0(PyObject *element1, PyObject
 #define _PyTuple_ITEMS(op) (((PyTupleObject *)(op))->ob_item)
 #endif
 
-extern PyObject *TUPLE_CONCAT(PyObject *tuple1, PyObject *tuple2);
+extern PyObject *TUPLE_CONCAT(PyThreadState *tstate, PyObject *tuple1, PyObject *tuple2);
 
-extern PyObject *TUPLE_COPY(PyObject *tuple);
+extern PyObject *TUPLE_COPY(PyThreadState *tstate, PyObject *tuple);
 
 #endif
 //     Part of "Nuitka", an optimizing Python compiler that is compatible and

nuitka/build/include/nuitka/importing.h

@@ -55,6 +55,11 @@ NUITKA_MAY_BE_UNUSED static PyObject *Nuitka_GetSysModules(void) {
 #endif
 }
 
+// Check if a module is in "sys.modules"
+NUITKA_MAY_BE_UNUSED static bool Nuitka_HasModule(PyThreadState *tstate, PyObject *module_name) {
+    return DICT_HAS_ITEM(tstate, Nuitka_GetSysModules(), module_name) == 1;
+}
+
 // Replacement for "PyImport_GetModule" working across all versions and less checks.
 NUITKA_MAY_BE_UNUSED static PyObject *Nuitka_GetModule(PyThreadState *tstate, PyObject *module_name) {
     return DICT_GET_ITEM1(tstate, Nuitka_GetSysModules(), module_name);