Nuitka-winsvc 2.4.11__cp311-cp311-win_amd64.whl → 2.5.6__cp311-cp311-win_amd64.whl

nuitka/build/static_src/HelpersDictionariesGenerated.c

@@ -7,21 +7,6 @@
 
 /* WARNING, this code is GENERATED. Modify the template HelperDictionaryCopy.c.j2 instead! */
 
-// Usable fraction of keys.
-#define DK_USABLE_FRACTION(n) (((n) << 1) / 3)
-
-#if PYTHON_VERSION < 0x3b0
-typedef PyObject *PyDictValues;
-#endif
-
-#if PYTHON_VERSION < 0x360
-#define DK_ENTRIES_SIZE(keys) (keys->dk_size)
-#elif PYTHON_VERSION < 0x3b0
-#define DK_ENTRIES_SIZE(keys) DK_USABLE_FRACTION(DK_SIZE(keys))
-#else
-#define DK_ENTRIES_SIZE(keys) (keys->dk_nentries)
-#endif
-
 // More than 2/3 of the keys are used, i.e. no space is wasted.
 #if PYTHON_VERSION < 0x360
 #define IS_COMPACT(dict_mp) (dict_mp->ma_used >= (dict_mp->ma_keys->dk_size * 2) / 3)
@@ -49,91 +34,6 @@ static inline PyDictValues *_Nuitka_PyDict_new_values(Py_ssize_t size) {
 #endif
 }
 
-#if PYTHON_VERSION >= 0x300
-static PyDictObject *_Nuitka_AllocatePyDictObject(PyThreadState *tstate) {
-    PyDictObject *result_mp;
-
-#if NUITKA_DICT_HAS_FREELIST
-    // This is the CPython name, spell-checker: ignore numfree
-
-#if PYTHON_VERSION < 0x3d0
-    PyDictObject **items = tstate->interp->dict_state.free_list;
-    int *numfree = &tstate->interp->dict_state.numfree;
-#else
-    struct _Py_object_freelists *freelists = _Nuitka_object_freelists_GET(tstate);
-    struct _Py_dict_freelist *state = &freelists->dicts;
-    PyDictObject **items = state->items;
-    int *numfree = &state->numfree;
-#endif
-
-    if (*numfree) {
-        (*numfree) -= 1;
-        result_mp = items[*numfree];
-
-        Nuitka_Py_NewReference((PyObject *)result_mp);
-
-        assert(PyDict_CheckExact((PyObject *)result_mp));
-        assert(result_mp != NULL);
-    } else
-#endif
-    {
-        result_mp = (PyDictObject *)Nuitka_GC_New(&PyDict_Type);
-    }
-
-    return result_mp;
-}
-#endif
-
-#if PYTHON_VERSION >= 0x360
-static PyDictKeysObject *_Nuitka_AllocatePyDictKeysObject(PyThreadState *tstate, Py_ssize_t keys_size) {
-    // CPython names, spell-checker: ignore numfree,dictkeys
-    PyDictKeysObject *dk;
-
-// TODO: Cannot always use cached objects. Need to also consider
-// "log2_size == PyDict_LOG_MINSIZE && unicode" as a criterion,
-// seems it can only be used for the smallest keys type.
-#if NUITKA_DICT_HAS_FREELIST && 0
-#if PYTHON_VERSION < 0x3d0
-    PyDictKeysObject **items = tstate->interp->dict_state.keys_free_list;
-    int *numfree = &tstate->interp->dict_state.keys_numfree;
-#else
-    struct _Py_object_freelists *freelists = _Nuitka_object_freelists_GET(tstate);
-    struct _Py_dictkeys_freelist *state = &freelists->dictkeys;
-    PyDictKeysObject **items = state->items;
-    int *numfree = &state->numfree;
-#endif
-
-    if (*numfree) {
-        (*numfree) -= 1;
-        dk = items[*numfree];
-    } else
-#endif
-    {
-        dk = (PyDictKeysObject *)NuitkaObject_Malloc(keys_size);
-    }
-
-    return dk;
-}
-#endif
-
-#if PYTHON_VERSION >= 0x360 && !defined(_NUITKA_EXPERIMENTAL_DISABLE_DICT_OPT)
-static Py_ssize_t _Nuitka_Py_PyDict_KeysSize(PyDictKeysObject *keys) {
-#if PYTHON_VERSION < 0x360
-    return sizeof(PyDictKeysObject) + (DK_SIZE(keys) - 1) * sizeof(PyDictKeyEntry);
-#elif PYTHON_VERSION < 0x370
-    return (sizeof(PyDictKeysObject) - Py_MEMBER_SIZE(PyDictKeysObject, dk_indices) + DK_IXSIZE(keys) * DK_SIZE(keys) +
-            DK_USABLE_FRACTION(DK_SIZE(keys)) * sizeof(PyDictKeyEntry));
-#elif PYTHON_VERSION < 0x3b0
-    return (sizeof(PyDictKeysObject) + DK_IXSIZE(keys) * DK_SIZE(keys) +
-            DK_USABLE_FRACTION(DK_SIZE(keys)) * sizeof(PyDictKeyEntry));
-#else
-    size_t entry_size = keys->dk_kind == DICT_KEYS_GENERAL ? sizeof(PyDictKeyEntry) : sizeof(PyDictUnicodeEntry);
-    return (sizeof(PyDictKeysObject) + ((size_t)1 << keys->dk_log2_index_bytes) +
-            DK_USABLE_FRACTION(DK_SIZE(keys)) * entry_size);
-#endif
-}
-#endif
-
 PyObject *DICT_COPY(PyThreadState *tstate, PyObject *dict_value) {
 #if _NUITKA_EXPERIMENTAL_DISABLE_DICT_OPT
     CHECK_OBJECT(dict_value);
@@ -170,13 +70,16 @@ PyObject *DICT_COPY(PyThreadState *tstate, PyObject *dict_value) {
         }
 #else
         /* Python 3 */
-#ifndef PY_NOGIL
         if (_PyDict_HasSplitTable(dict_mp)) {
             PyDictObject *result_mp = _Nuitka_AllocatePyDictObject(tstate);
             assert(result_mp != NULL);
             result = (PyObject *)result_mp;
 
+#if PYTHON_VERSION < 0x3b0
             Py_ssize_t size = DK_ENTRIES_SIZE(dict_mp->ma_keys);
+#else
+            Py_ssize_t size = dict_mp->ma_keys->dk_nentries + dict_mp->ma_keys->dk_usable;
+#endif
 
             PyDictValues *new_values = _Nuitka_PyDict_new_values(size);
             assert(new_values != NULL);
@@ -211,7 +114,6 @@ PyObject *DICT_COPY(PyThreadState *tstate, PyObject *dict_value) {
 
             Nuitka_GC_Track(result_mp);
         } else
-#endif
 #if PYTHON_VERSION >= 0x360
             // Fast dictionary copy if it has at least 2/3 space usage. This is most relevant
             // for the DICT_COPY, where it might even be the intention to trigger a shrink with
@@ -386,13 +288,16 @@ PyObject *DEEP_COPY_DICT(PyThreadState *tstate, PyObject *dict_value) {
         }
 #else
         /* Python 3 */
-#ifndef PY_NOGIL
         if (_PyDict_HasSplitTable(dict_mp)) {
             PyDictObject *result_mp = _Nuitka_AllocatePyDictObject(tstate);
             assert(result_mp != NULL);
             result = (PyObject *)result_mp;
 
+#if PYTHON_VERSION < 0x3b0
             Py_ssize_t size = DK_ENTRIES_SIZE(dict_mp->ma_keys);
+#else
+            Py_ssize_t size = dict_mp->ma_keys->dk_nentries + dict_mp->ma_keys->dk_usable;
+#endif
 
             PyDictValues *new_values = _Nuitka_PyDict_new_values(size);
             assert(new_values != NULL);
@@ -427,7 +332,6 @@ PyObject *DEEP_COPY_DICT(PyThreadState *tstate, PyObject *dict_value) {
 
             Nuitka_GC_Track(result_mp);
         } else
-#endif
 #if PYTHON_VERSION >= 0x360
             // Fast dictionary copy if it has at least 2/3 space usage. This is most relevant
             // for the DICT_COPY, where it might even be the intention to trigger a shrink with
@@ -613,14 +517,16 @@ static PyObject *COPY_DICT_KW(PyThreadState *tstate, PyObject *dict_value) {
         }
 #else
         /* Python 3 */
-#ifndef PY_NOGIL
         if (_PyDict_HasSplitTable(dict_mp)) {
             PyDictObject *result_mp = _Nuitka_AllocatePyDictObject(tstate);
             assert(result_mp != NULL);
             result = (PyObject *)result_mp;
 
+#if PYTHON_VERSION < 0x3b0
             Py_ssize_t size = DK_ENTRIES_SIZE(dict_mp->ma_keys);
-
+#else
+            Py_ssize_t size = dict_mp->ma_keys->dk_nentries + dict_mp->ma_keys->dk_usable;
+#endif
 #if PYTHON_VERSION < 0x3b0
             for (Py_ssize_t i = 0; i < size; i++) {
                 PyDictKeyEntry *entry = &DK_ENTRIES(dict_mp->ma_keys)[i];
@@ -678,7 +584,6 @@ static PyObject *COPY_DICT_KW(PyThreadState *tstate, PyObject *dict_value) {
 
             Nuitka_GC_Track(result_mp);
         } else
-#endif
 #if PYTHON_VERSION >= 0x360
             // Fast dictionary copy if it has at least 2/3 space usage. This is most relevant
             // for the DICT_COPY, where it might even be the intention to trigger a shrink with

nuitka/build/static_src/HelpersExceptions.c

@@ -42,36 +42,36 @@ void SET_CURRENT_EXCEPTION_TYPE_COMPLAINT_NICE(char const *format, PyObject *mis
     SET_CURRENT_EXCEPTION_TYPE0_FORMAT1(PyExc_TypeError, format, TYPE_NAME_DESC(mistyped));
 }
 
-void FORMAT_UNBOUND_LOCAL_ERROR(PyObject **exception_type, PyObject **exception_value, PyObject *variable_name) {
-    *exception_type = PyExc_UnboundLocalError;
-    Py_INCREF(*exception_type);
-
+void FORMAT_UNBOUND_LOCAL_ERROR(PyThreadState *tstate, struct Nuitka_ExceptionPreservationItem *exception_state,
+                                PyObject *variable_name) {
 #if PYTHON_VERSION < 0x300
     char const *message = "local variable '%s' referenced before assignment";
-    *exception_value = Nuitka_String_FromFormat(message, Nuitka_String_AsString_Unchecked(variable_name));
+    PyObject *exception_value = Nuitka_String_FromFormat(message, Nuitka_String_AsString_Unchecked(variable_name));
 #elif PYTHON_VERSION < 0x3b0
     char const *message = "local variable '%U' referenced before assignment";
-    *exception_value = Nuitka_String_FromFormat(message, variable_name);
+    PyObject *exception_value = Nuitka_String_FromFormat(message, variable_name);
 #else
     char const *message = "cannot access local variable '%U' where it is not associated with a value";
-    *exception_value = Nuitka_String_FromFormat(message, variable_name);
+    PyObject *exception_value = Nuitka_String_FromFormat(message, variable_name);
 #endif
 
-    CHECK_OBJECT(*exception_value);
+    CHECK_OBJECT(exception_value);
+    SET_EXCEPTION_PRESERVATION_STATE_FROM_TYPE0_VALUE1(tstate, exception_state, PyExc_UnboundLocalError,
+                                                       exception_value);
 }
 
-void FORMAT_UNBOUND_CLOSURE_ERROR(PyObject **exception_type, PyObject **exception_value, PyObject *variable_name) {
-    *exception_type = PyExc_NameError;
-    Py_INCREF(*exception_type);
-
+void FORMAT_UNBOUND_CLOSURE_ERROR(PyThreadState *tstate, struct Nuitka_ExceptionPreservationItem *exception_state,
+                                  PyObject *variable_name) {
 #if PYTHON_VERSION < 0x3b0
     char const *message = "free variable '%s' referenced before assignment in enclosing scope";
 #else
     char const *message = "cannot access free variable '%s' where it is not associated with a value in enclosing scope";
 #endif
 
-    *exception_value = Nuitka_String_FromFormat(message, Nuitka_String_AsString_Unchecked(variable_name));
-    CHECK_OBJECT(*exception_value);
+    PyObject *exception_value = Nuitka_String_FromFormat(message, Nuitka_String_AsString_Unchecked(variable_name));
+    CHECK_OBJECT(exception_value);
+
+    SET_EXCEPTION_PRESERVATION_STATE_FROM_TYPE0_VALUE1(tstate, exception_state, PyExc_NameError, exception_value);
 }
 
 static PyObject *_Nuitka_Err_CreateException(PyThreadState *tstate, PyObject *exception_type, PyObject *value) {
@@ -80,7 +80,7 @@ static PyObject *_Nuitka_Err_CreateException(PyThreadState *tstate, PyObject *ex
     if (value == NULL || value == Py_None) {
         exc = CALL_FUNCTION_NO_ARGS(tstate, exception_type);
     } else if (PyTuple_Check(value)) {
-        exc = CALL_FUNCTION_WITH_POSARGS(tstate, exception_type, value);
+        exc = CALL_FUNCTION_WITH_POS_ARGS(tstate, exception_type, value);
     } else {
         exc = CALL_FUNCTION_WITH_SINGLE_ARG(tstate, exception_type, value);
     }
@@ -98,6 +98,10 @@ static PyObject *_Nuitka_Err_CreateException(PyThreadState *tstate, PyObject *ex
     return exc;
 }
 
+PyObject *MAKE_EXCEPTION_WITH_VALUE(PyThreadState *tstate, PyObject *exception_type, PyObject *value) {
+    return _Nuitka_Err_CreateException(tstate, exception_type, value);
+}
+
 // Our replacement for PyErr_NormalizeException, that however does not attempt
 // to deal with recursion, i.e. exception during normalization, we just avoid
 // the API call overhead in the normal case.
@@ -169,7 +173,11 @@ error:
 
     initial_tb = *tb;
 
-    FETCH_ERROR_OCCURRED(tstate, exc, val, tb);
+    struct Nuitka_ExceptionPreservationItem exception_state;
+    FETCH_ERROR_OCCURRED_STATE(tstate, &exception_state);
+
+    ASSIGN_ARGS_FROM_EXCEPTION_PRESERVATION_STATE(&exception_state, exc, val, tb);
+    RELEASE_ERROR_OCCURRED_STATE(&exception_state);
 
     assert(*exc != NULL);
     if (initial_tb != NULL) {
@@ -274,40 +282,6 @@ error:
 
 #endif
 
-// Raise NameError for a given variable name.
-void SET_CURRENT_EXCEPTION_NAME_ERROR(PyThreadState *tstate, PyObject *variable_name) {
-#if PYTHON_VERSION >= 0x300
-    PyObject *exception_value_str = Nuitka_String_FromFormat("name '%U' is not defined", variable_name);
-#else
-    PyObject *exception_value_str =
-        Nuitka_String_FromFormat("name '%s' is not defined", Nuitka_String_AsString_Unchecked(variable_name));
-#endif
-    PyObject *exception_value = MAKE_EXCEPTION_FROM_TYPE_ARG0(tstate, PyExc_NameError, exception_value_str);
-    Py_DECREF(exception_value_str);
-
-#if PYTHON_VERSION >= 0x300
-    CHAIN_EXCEPTION(tstate, exception_value);
-#endif
-
-    SET_CURRENT_EXCEPTION_TYPE0_VALUE1(tstate, PyExc_NameError, exception_value);
-}
-
-// Raise NameError with "global" for a given variable name.
-#if PYTHON_VERSION < 0x340
-void SET_CURRENT_EXCEPTION_GLOBAL_NAME_ERROR(PyThreadState *tstate, PyObject *variable_name) {
-#if PYTHON_VERSION >= 0x300
-    PyObject *exception_value_str = Nuitka_String_FromFormat("global name '%U' is not defined", variable_name);
-#else
-    PyObject *exception_value_str =
-        Nuitka_String_FromFormat("global name '%s' is not defined", Nuitka_String_AsString_Unchecked(variable_name));
-#endif
-    PyObject *exception_value = MAKE_EXCEPTION_FROM_TYPE_ARG0(tstate, PyExc_NameError, exception_value_str);
-    Py_DECREF(exception_value_str);
-
-    SET_CURRENT_EXCEPTION_TYPE0_VALUE1(tstate, PyExc_NameError, exception_value);
-}
-#endif
-
 //     Part of "Nuitka", an optimizing Python compiler that is compatible and
 //     integrates with CPython, but also works on its own.
 //

nuitka/build/static_src/HelpersFiles.c

@@ -83,10 +83,10 @@ PyObject *BUILTIN_OPEN_BINARY_READ_SIMPLE(PyThreadState *tstate, PyObject *filen
 }
 
 PyObject *GET_FILE_BYTES(PyThreadState *tstate, PyObject *filename) {
-    PyObject *result;
+    PyObject *read_result;
 
-    if (TRACE_FILE_READ(tstate, filename, &result)) {
-        return result;
+    if (TRACE_FILE_READ(tstate, filename, &read_result)) {
+        return read_result;
     }
 
     PyObject *data_file = BUILTIN_OPEN_BINARY_READ_SIMPLE(tstate, filename);
@@ -103,9 +103,32 @@ PyObject *GET_FILE_BYTES(PyThreadState *tstate, PyObject *filename) {
         return NULL;
     }
 
-    result = CALL_FUNCTION_NO_ARGS(tstate, read_method);
+    PyObject *close_method = LOOKUP_ATTRIBUTE(tstate, data_file, const_str_plain_close);
+
+    if (unlikely(close_method == NULL)) {
+        Py_DECREF(read_method);
+        return NULL;
+    }
+
+    read_result = CALL_FUNCTION_NO_ARGS(tstate, read_method);
     Py_DECREF(read_method);
-    return result;
+
+    if (unlikely(read_result == NULL)) {
+        Py_DECREF(close_method);
+        return NULL;
+    }
+
+    PyObject *close_result = CALL_FUNCTION_NO_ARGS(tstate, close_method);
+    Py_DECREF(close_method);
+
+    if (unlikely(close_result == NULL)) {
+        Py_DECREF(read_result);
+        return NULL;
+    }
+
+    Py_DECREF(close_result);
+
+    return read_result;
 }
 
 // TODO: Don't we have this generated.
@@ -185,6 +208,57 @@ PyObject *OS_LISTDIR(PyThreadState *tstate, PyObject *path) {
     return result;
 }
 
+extern PyObject *OS_STAT(PyThreadState *tstate, PyObject *path, PyObject *dir_fd, PyObject *follow_symlinks) {
+    assert(path != NULL);
+
+    PyObject *result;
+
+    if (TRACE_FILE_STAT(tstate, path, dir_fd, follow_symlinks, &result)) {
+        return result;
+    }
+
+    PyObject *stat_func = LOOKUP_ATTRIBUTE(tstate, IMPORT_HARD_OS(), const_str_plain_stat);
+
+#if PYTHON_VERSION < 0x300
+    assert(dir_fd == NULL);
+
+    result = CALL_FUNCTION_WITH_SINGLE_ARG(tstate, stat_func, path);
+#else
+
+    PyObject *args[] = {path, dir_fd, follow_symlinks};
+
+    char const *arg_names[] = {"path", "dir_fd", "follow_symlinks"};
+    result = CALL_BUILTIN_KW_ARGS(tstate, stat_func, args, arg_names, 3, 2);
+#endif
+
+    Py_DECREF(stat_func);
+    return result;
+}
+
+extern PyObject *OS_LSTAT(PyThreadState *tstate, PyObject *path, PyObject *dir_fd) {
+#if PYTHON_VERSION < 0x300
+    assert(path != NULL);
+    PyObject *result;
+
+    if (TRACE_FILE_STAT(tstate, path, dir_fd, false, &result)) {
+        return result;
+    }
+
+    assert(path != NULL);
+    assert(dir_fd == NULL);
+    PyObject *stat_func = LOOKUP_ATTRIBUTE(tstate, IMPORT_HARD_OS(), const_str_plain_lstat);
+
+    result = CALL_FUNCTION_WITH_SINGLE_ARG(tstate, stat_func, path);
+
+    Py_DECREF(stat_func);
+    return result;
+#else
+    PyObject *follow_symlinks = Py_False;
+
+    return OS_STAT(tstate, path, dir_fd, follow_symlinks);
+#endif
+}
+
 PyObject *OS_PATH_BASENAME(PyThreadState *tstate, PyObject *filename) {
     CHECK_OBJECT(filename);
 

nuitka/build/static_src/HelpersImport.c

@@ -31,7 +31,7 @@ PyObject *IMPORT_MODULE_KW(PyThreadState *tstate, PyObject *module_name, PyObjec
 
     NUITKA_ASSIGN_BUILTIN(__import__);
 
-    PyObject *import_result = CALL_FUNCTION_WITH_KEYARGS(tstate, NUITKA_ACCESS_BUILTIN(__import__), kw_args);
+    PyObject *import_result = CALL_FUNCTION_WITH_KW_ARGS(tstate, NUITKA_ACCESS_BUILTIN(__import__), kw_args);
 
     Py_DECREF(kw_args);
 
@@ -143,19 +143,23 @@ bool IMPORT_MODULE_STAR(PyThreadState *tstate, PyObject *target, bool is_module,
         }
 
         all_case = true;
-    } else if (EXCEPTION_MATCH_BOOL_SINGLE(tstate, GET_ERROR_OCCURRED(tstate), PyExc_AttributeError)) {
-        CLEAR_ERROR_OCCURRED(tstate);
+    } else {
+        assert(HAS_ERROR_OCCURRED(tstate));
 
-        iter = MAKE_ITERATOR(tstate, PyModule_GetDict(module));
-        CHECK_OBJECT(iter);
+        if (EXCEPTION_MATCH_BOOL_SINGLE(tstate, GET_ERROR_OCCURRED(tstate), PyExc_AttributeError)) {
+            CLEAR_ERROR_OCCURRED(tstate);
 
-        all_case = false;
-    } else {
-        return false;
+            iter = MAKE_ITERATOR(tstate, PyModule_GetDict(module));
+            CHECK_OBJECT(iter);
+
+            all_case = false;
+        } else {
+            return false;
+        }
     }
 
     for (;;) {
-        PyObject *item = ITERATOR_NEXT(iter);
+        PyObject *item = ITERATOR_NEXT_ITERATOR(iter);
         if (item == NULL) {
             break;
         }

nuitka/build/static_src/HelpersImportHard.c

@@ -18,8 +18,7 @@ PyObject *IMPORT_HARD___FUTURE__(void) {
 #ifndef __NUITKA_NO_ASSERT__
             PyErr_PrintEx(0);
 #endif
-            NUITKA_CANNOT_GET_HERE("failed hard import of '__future__'");
-            abort();
+            NUITKA_ERROR_EXIT("Unexpected failure of hard import of '__future__'");
         }
     }
 
@@ -38,8 +37,7 @@ PyObject *IMPORT_HARD__FROZEN_IMPORTLIB(void) {
 #ifndef __NUITKA_NO_ASSERT__
             PyErr_PrintEx(0);
 #endif
-            NUITKA_CANNOT_GET_HERE("failed hard import of '_frozen_importlib'");
-            abort();
+            NUITKA_ERROR_EXIT("Unexpected failure of hard import of '_frozen_importlib'");
         }
     }
 
@@ -59,8 +57,7 @@ PyObject *IMPORT_HARD__FROZEN_IMPORTLIB_EXTERNAL(void) {
 #ifndef __NUITKA_NO_ASSERT__
             PyErr_PrintEx(0);
 #endif
-            NUITKA_CANNOT_GET_HERE("failed hard import of '_frozen_importlib_external'");
-            abort();
+            NUITKA_ERROR_EXIT("Unexpected failure of hard import of '_frozen_importlib_external'");
         }
     }
 
@@ -79,8 +76,7 @@ PyObject *IMPORT_HARD__IO(void) {
 #ifndef __NUITKA_NO_ASSERT__
             PyErr_PrintEx(0);
 #endif
-            NUITKA_CANNOT_GET_HERE("failed hard import of '_io'");
-            abort();
+            NUITKA_ERROR_EXIT("Unexpected failure of hard import of '_io'");
         }
     }
 
@@ -98,8 +94,7 @@ PyObject *IMPORT_HARD_BUILTINS(void) {
 #ifndef __NUITKA_NO_ASSERT__
             PyErr_PrintEx(0);
 #endif
-            NUITKA_CANNOT_GET_HERE("failed hard import of 'builtins'");
-            abort();
+            NUITKA_ERROR_EXIT("Unexpected failure of hard import of 'builtins'");
         }
     }
 
@@ -117,8 +112,7 @@ PyObject *IMPORT_HARD_CTYPES(void) {
 #ifndef __NUITKA_NO_ASSERT__
             PyErr_PrintEx(0);
 #endif
-            NUITKA_CANNOT_GET_HERE("failed hard import of 'ctypes'");
-            abort();
+            NUITKA_ERROR_EXIT("Unexpected failure of hard import of 'ctypes'");
         }
     }
 
@@ -136,8 +130,7 @@ PyObject *IMPORT_HARD_CTYPES__MACHOLIB(void) {
 #ifndef __NUITKA_NO_ASSERT__
             PyErr_PrintEx(0);
 #endif
-            NUITKA_CANNOT_GET_HERE("failed hard import of 'ctypes.macholib'");
-            abort();
+            NUITKA_ERROR_EXIT("Unexpected failure of hard import of 'ctypes.macholib'");
         }
     }
 
@@ -156,8 +149,7 @@ PyObject *IMPORT_HARD_CTYPES__WINTYPES(void) {
 #ifndef __NUITKA_NO_ASSERT__
             PyErr_PrintEx(0);
 #endif
-            NUITKA_CANNOT_GET_HERE("failed hard import of 'ctypes.wintypes'");
-            abort();
+            NUITKA_ERROR_EXIT("Unexpected failure of hard import of 'ctypes.wintypes'");
         }
     }
 
@@ -176,8 +168,7 @@ PyObject *IMPORT_HARD_FUNCTOOLS(void) {
 #ifndef __NUITKA_NO_ASSERT__
             PyErr_PrintEx(0);
 #endif
-            NUITKA_CANNOT_GET_HERE("failed hard import of 'functools'");
-            abort();
+            NUITKA_ERROR_EXIT("Unexpected failure of hard import of 'functools'");
         }
     }
 
@@ -195,8 +186,7 @@ PyObject *IMPORT_HARD_IMPORTLIB(void) {
 #ifndef __NUITKA_NO_ASSERT__
             PyErr_PrintEx(0);
 #endif
-            NUITKA_CANNOT_GET_HERE("failed hard import of 'importlib'");
-            abort();
+            NUITKA_ERROR_EXIT("Unexpected failure of hard import of 'importlib'");
         }
     }
 
@@ -215,8 +205,7 @@ PyObject *IMPORT_HARD_IMPORTLIB__METADATA(void) {
 #ifndef __NUITKA_NO_ASSERT__
             PyErr_PrintEx(0);
 #endif
-            NUITKA_CANNOT_GET_HERE("failed hard import of 'importlib.metadata'");
-            abort();
+            NUITKA_ERROR_EXIT("Unexpected failure of hard import of 'importlib.metadata'");
         }
     }
 
@@ -236,8 +225,7 @@ PyObject *IMPORT_HARD_IMPORTLIB__RESOURCES(void) {
 #ifndef __NUITKA_NO_ASSERT__
             PyErr_PrintEx(0);
 #endif
-            NUITKA_CANNOT_GET_HERE("failed hard import of 'importlib.resources'");
-            abort();
+            NUITKA_ERROR_EXIT("Unexpected failure of hard import of 'importlib.resources'");
         }
     }
 
@@ -286,8 +274,7 @@ PyObject *IMPORT_HARD_IO(void) {
 #ifndef __NUITKA_NO_ASSERT__
             PyErr_PrintEx(0);
 #endif
-            NUITKA_CANNOT_GET_HERE("failed hard import of 'io'");
-            abort();
+            NUITKA_ERROR_EXIT("Unexpected failure of hard import of 'io'");
         }
     }
 
@@ -305,8 +292,7 @@ PyObject *IMPORT_HARD_NTPATH(void) {
 #ifndef __NUITKA_NO_ASSERT__
             PyErr_PrintEx(0);
 #endif
-            NUITKA_CANNOT_GET_HERE("failed hard import of 'ntpath'");
-            abort();
+            NUITKA_ERROR_EXIT("Unexpected failure of hard import of 'ntpath'");
         }
     }
 
@@ -324,8 +310,7 @@ PyObject *IMPORT_HARD_OS(void) {
 #ifndef __NUITKA_NO_ASSERT__
             PyErr_PrintEx(0);
 #endif
-            NUITKA_CANNOT_GET_HERE("failed hard import of 'os'");
-            abort();
+            NUITKA_ERROR_EXIT("Unexpected failure of hard import of 'os'");
         }
     }
 
@@ -358,8 +343,7 @@ PyObject *IMPORT_HARD_PKGUTIL(void) {
 #ifndef __NUITKA_NO_ASSERT__
             PyErr_PrintEx(0);
 #endif
-            NUITKA_CANNOT_GET_HERE("failed hard import of 'pkgutil'");
-            abort();
+            NUITKA_ERROR_EXIT("Unexpected failure of hard import of 'pkgutil'");
         }
     }
 
@@ -377,8 +361,7 @@ PyObject *IMPORT_HARD_POSIXPATH(void) {
 #ifndef __NUITKA_NO_ASSERT__
             PyErr_PrintEx(0);
 #endif
-            NUITKA_CANNOT_GET_HERE("failed hard import of 'posixpath'");
-            abort();
+            NUITKA_ERROR_EXIT("Unexpected failure of hard import of 'posixpath'");
         }
     }
 
@@ -411,8 +394,7 @@ PyObject *IMPORT_HARD_SYS(void) {
 #ifndef __NUITKA_NO_ASSERT__
             PyErr_PrintEx(0);
 #endif
-            NUITKA_CANNOT_GET_HERE("failed hard import of 'sys'");
-            abort();
+            NUITKA_ERROR_EXIT("Unexpected failure of hard import of 'sys'");
         }
     }
 
@@ -430,8 +412,7 @@ PyObject *IMPORT_HARD_SYSCONFIG(void) {
 #ifndef __NUITKA_NO_ASSERT__
             PyErr_PrintEx(0);
 #endif
-            NUITKA_CANNOT_GET_HERE("failed hard import of 'sysconfig'");
-            abort();
+            NUITKA_ERROR_EXIT("Unexpected failure of hard import of 'sysconfig'");
         }
     }
 
@@ -464,8 +445,7 @@ PyObject *IMPORT_HARD_TYPES(void) {
 #ifndef __NUITKA_NO_ASSERT__
             PyErr_PrintEx(0);
 #endif
-            NUITKA_CANNOT_GET_HERE("failed hard import of 'types'");
-            abort();
+            NUITKA_ERROR_EXIT("Unexpected failure of hard import of 'types'");
         }
     }
 
@@ -484,8 +464,7 @@ PyObject *IMPORT_HARD_TYPING(void) {
 #ifndef __NUITKA_NO_ASSERT__
             PyErr_PrintEx(0);
 #endif
-            NUITKA_CANNOT_GET_HERE("failed hard import of 'typing'");
-            abort();
+            NUITKA_ERROR_EXIT("Unexpected failure of hard import of 'typing'");
         }
     }
 
@@ -504,8 +483,7 @@ PyObject *IMPORT_HARD_UNITTEST(void) {
 #ifndef __NUITKA_NO_ASSERT__
             PyErr_PrintEx(0);
 #endif
-            NUITKA_CANNOT_GET_HERE("failed hard import of 'unittest'");
-            abort();
+            NUITKA_ERROR_EXIT("Unexpected failure of hard import of 'unittest'");
         }
     }
 
@@ -524,8 +502,7 @@ PyObject *IMPORT_HARD_UNITTEST__MOCK(void) {
 #ifndef __NUITKA_NO_ASSERT__
             PyErr_PrintEx(0);
 #endif
-            NUITKA_CANNOT_GET_HERE("failed hard import of 'unittest.mock'");
-            abort();
+            NUITKA_ERROR_EXIT("Unexpected failure of hard import of 'unittest.mock'");
         }
     }