Nuitka-winsvc 1.8__cp311-cp311-win_amd64.whl → 2.5.1__cp311-cp311-win_amd64.whl

nuitka/build/include/nuitka/exceptions.h

@@ -1,20 +1,5 @@
-//     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-//
-//     Part of "Nuitka", an optimizing Python compiler that is compatible and
-//     integrates with CPython, but also works on its own.
-//
-//     Licensed under the Apache License, Version 2.0 (the "License");
-//     you may not use this file except in compliance with the License.
-//     You may obtain a copy of the License at
-//
-//        http://www.apache.org/licenses/LICENSE-2.0
-//
-//     Unless required by applicable law or agreed to in writing, software
-//     distributed under the License is distributed on an "AS IS" BASIS,
-//     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//     See the License for the specific language governing permissions and
-//     limitations under the License.
-//
+//     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
 #ifndef __NUITKA_EXCEPTIONS_H__
 #define __NUITKA_EXCEPTIONS_H__
 
@@ -26,7 +11,7 @@
 #include "nuitka/printing.h"
 
 // Did an error occur.
-NUITKA_MAY_BE_UNUSED static inline bool HAS_ERROR_OCCURRED(PyThreadState *tstate) {
+NUITKA_MAY_BE_UNUSED static inline bool HAS_ERROR_OCCURRED(PyThreadState const *tstate) {
 #if PYTHON_VERSION < 0x3c0
     return tstate->curexc_type != NULL;
 #else
@@ -34,16 +19,28 @@ NUITKA_MAY_BE_UNUSED static inline bool HAS_ERROR_OCCURRED(PyThreadState *tstate
 #endif
 }
 
-// Get the error type occurred.
-NUITKA_MAY_BE_UNUSED static inline PyObject *GET_ERROR_OCCURRED(PyThreadState *tstate) {
+// Get the error type occurred, no reference given.
+NUITKA_MAY_BE_UNUSED static inline PyObject *GET_ERROR_OCCURRED(PyThreadState const *const tstate) {
 #if PYTHON_VERSION < 0x3c0
     return tstate->curexc_type;
 #else
-    return (PyObject *)Py_TYPE(tstate->current_exception);
+    return tstate->current_exception ? (PyObject *)PyExceptionInstance_Class(tstate->current_exception) : NULL;
 #endif
 }
 
-// Clear error, which likely set, similar to _PyErr_Clear(tstate)
+// Checks that an exception value is normalized or NULL.
+NUITKA_MAY_BE_UNUSED static inline void ASSERT_NORMALIZED_EXCEPTION_VALUE_X(PyObject const *const exception_value) {
+    CHECK_OBJECT_X(exception_value);
+    assert(exception_value == NULL || PyExceptionInstance_Check(exception_value));
+}
+
+// Checks that an exception value is normalized and not NULL.
+NUITKA_MAY_BE_UNUSED static inline void ASSERT_NORMALIZED_EXCEPTION_VALUE(PyObject *exception_value) {
+    CHECK_OBJECT(exception_value);
+    assert(PyExceptionInstance_Check(exception_value));
+}
+
+// Clear error, which likely set, similar to "_PyErr_Clear(tstate)" and "PyErr_Clear"
 NUITKA_MAY_BE_UNUSED static inline void CLEAR_ERROR_OCCURRED(PyThreadState *tstate) {
 #if PYTHON_VERSION < 0x3c0
     PyObject *old_type = tstate->curexc_type;
@@ -58,13 +55,16 @@ NUITKA_MAY_BE_UNUSED static inline void CLEAR_ERROR_OCCURRED(PyThreadState *tsta
     Py_XDECREF(old_value);
     Py_XDECREF(old_tb);
 #else
-    PyObject *old_exception = tstate->current_exception;
+    PyObject *old_exception_value = tstate->current_exception;
+    ASSERT_NORMALIZED_EXCEPTION_VALUE_X(old_exception_value);
+
     tstate->current_exception = NULL;
-    Py_XDECREF(old_exception);
+
+    Py_XDECREF(old_exception_value);
 #endif
 }
 
-// Clear error, which is not likely set, use CLEAR_ERROR_OCCURRED not sure there is an error.
+// Clear error, which is not likely set, use "CLEAR_ERROR_OCCURRED" not sure there is an error.
 NUITKA_MAY_BE_UNUSED static inline bool DROP_ERROR_OCCURRED(PyThreadState *tstate) {
 
 #if PYTHON_VERSION < 0x3c0
@@ -85,11 +85,12 @@ NUITKA_MAY_BE_UNUSED static inline bool DROP_ERROR_OCCURRED(PyThreadState *tstat
     }
 #else
     if (unlikely(tstate->current_exception != NULL)) {
-        PyObject *old_exception = tstate->current_exception;
+        PyObject *old_exception_value = tstate->current_exception;
+        ASSERT_NORMALIZED_EXCEPTION_VALUE(old_exception_value);
 
         tstate->current_exception = NULL;
 
-        Py_DECREF(old_exception);
+        Py_DECREF(old_exception_value);
 
         return true;
     }
@@ -97,9 +98,8 @@ NUITKA_MAY_BE_UNUSED static inline bool DROP_ERROR_OCCURRED(PyThreadState *tstat
     return false;
 }
 
-// Python3.12: TODO, fetching into a structure is probably needed.
 #if PYTHON_VERSION < 0x3c0
-// Fetch the current error into object variables.
+// Fetch the current error into object variables, transfers reference coming from tstate ownership
 NUITKA_MAY_BE_UNUSED static void FETCH_ERROR_OCCURRED(PyThreadState *tstate, PyObject **exception_type,
                                                       PyObject **exception_value,
                                                       PyTracebackObject **exception_traceback) {
@@ -180,6 +180,7 @@ NUITKA_MAY_BE_UNUSED static PyTracebackObject *ADD_TRACEBACK(PyTracebackObject *
 
     PyTracebackObject *traceback_new = MAKE_TRACEBACK(frame, lineno);
     traceback_new->tb_next = exception_tb;
+    Py_INCREF(exception_tb);
     return traceback_new;
 }
 
@@ -315,7 +316,7 @@ NUITKA_MAY_BE_UNUSED inline static void SET_CURRENT_EXCEPTION(PyThreadState *tst
 #endif
 
 #if _NUITKA_MAINTAIN_SYS_EXC_VARS
-    // Set sys attributes in the fastest possible way.
+    // Set sys attributes in the fastest possible way, spell-checker: ignore sysdict
     PyObject *sys_dict = tstate->interp->sysdict;
     CHECK_OBJECT(sys_dict);
 
@@ -337,8 +338,16 @@ NUITKA_MAY_BE_UNUSED inline static void SET_CURRENT_EXCEPTION(PyThreadState *tst
 #endif
 }
 
+// Normalize an exception, may release old values and replace them, expects
+// references passed and returns them.
+NUITKA_MAY_BE_UNUSED static inline void NORMALIZE_EXCEPTION(PyThreadState *tstate, PyObject **exception_type,
+                                                            PyObject **exception_value,
+                                                            PyTracebackObject **exception_tb);
+
+extern PyObject *NORMALIZE_EXCEPTION_VALUE_FOR_RAISE(PyThreadState *tstate, PyObject *exception_type);
+
 // Helper that sets the current thread exception, and has no reference passed.
-// Similar to PyErr_SetNone.
+// Similar to "PyErr_SetNone".
 NUITKA_MAY_BE_UNUSED inline static void SET_CURRENT_EXCEPTION_TYPE0(PyThreadState *tstate, PyObject *exception_type) {
     CHECK_OBJECT(exception_type);
 
@@ -362,9 +371,12 @@ NUITKA_MAY_BE_UNUSED inline static void SET_CURRENT_EXCEPTION_TYPE0(PyThreadStat
     Py_XDECREF(old_exception_traceback);
 #else
     PyObject *old_exception = tstate->current_exception;
+    ASSERT_NORMALIZED_EXCEPTION_VALUE_X(old_exception);
 
-    tstate->current_exception = exception_type;
-    Py_INCREF(exception_type);
+    // TODO: Make the call, exception creation on the outside somehow.
+    PyObject *exception_value = NORMALIZE_EXCEPTION_VALUE_FOR_RAISE(tstate, exception_type);
+    ASSERT_NORMALIZED_EXCEPTION_VALUE(exception_value);
+    tstate->current_exception = exception_value;
 
 #if _DEBUG_EXCEPTIONS
     PRINT_STRING("SET_CURRENT_EXCEPTION_TYPE0:\n");
@@ -376,9 +388,12 @@ NUITKA_MAY_BE_UNUSED inline static void SET_CURRENT_EXCEPTION_TYPE0(PyThreadStat
 }
 
 // Same as "PyErr_SetObject" CPython API, use this instead.
-#if PYTHON_VERSION < 0x3c0
 NUITKA_MAY_BE_UNUSED inline static void
 SET_CURRENT_EXCEPTION_TYPE0_VALUE0(PyThreadState *tstate, PyObject *exception_type, PyObject *exception_value) {
+    CHECK_OBJECT(exception_type);
+    CHECK_OBJECT(exception_value);
+
+#if PYTHON_VERSION < 0x3c0
     PyObject *old_exception_type = tstate->curexc_type;
     PyObject *old_exception_value = tstate->curexc_value;
     PyObject *old_exception_traceback = tstate->curexc_traceback;
@@ -397,10 +412,33 @@ SET_CURRENT_EXCEPTION_TYPE0_VALUE0(PyThreadState *tstate, PyObject *exception_ty
     Py_XDECREF(old_exception_type);
     Py_XDECREF(old_exception_value);
     Py_XDECREF(old_exception_traceback);
+#else
+    PyObject *old_exception_value = tstate->current_exception;
+    ASSERT_NORMALIZED_EXCEPTION_VALUE_X(old_exception_value);
+
+    // TODO: Make the call on the outside.
+    NORMALIZE_EXCEPTION(tstate, &exception_type, &exception_value, NULL);
+    ASSERT_NORMALIZED_EXCEPTION_VALUE(exception_value);
+    tstate->current_exception = exception_value;
+    Py_INCREF(exception_value);
+
+#if _DEBUG_EXCEPTIONS
+    PRINT_STRING("SET_CURRENT_EXCEPTION_TYPE_0_VALUE0:\n");
+    PRINT_CURRENT_EXCEPTION();
+#endif
+
+    Py_XDECREF(old_exception_value);
+#endif
 }
 
+// TODO: For Python3.12 it would be nice to know it's normalized already, so we
+// can avoid the call to "NORMALIZE_EXCEPTION".
 NUITKA_MAY_BE_UNUSED inline static void
 SET_CURRENT_EXCEPTION_TYPE0_VALUE1(PyThreadState *tstate, PyObject *exception_type, PyObject *exception_value) {
+    CHECK_OBJECT(exception_type);
+    CHECK_OBJECT(exception_value);
+
+#if PYTHON_VERSION < 0x3c0
     PyObject *old_exception_type = tstate->curexc_type;
     PyObject *old_exception_value = tstate->curexc_value;
     PyObject *old_exception_traceback = tstate->curexc_traceback;
@@ -418,9 +456,23 @@ SET_CURRENT_EXCEPTION_TYPE0_VALUE1(PyThreadState *tstate, PyObject *exception_ty
     Py_XDECREF(old_exception_type);
     Py_XDECREF(old_exception_value);
     Py_XDECREF(old_exception_traceback);
-}
+#else
+    PyObject *old_exception_value = tstate->current_exception;
+    ASSERT_NORMALIZED_EXCEPTION_VALUE_X(old_exception_value);
+
+    // TODO: Make the call, exception creation on the outside somehow.
+    NORMALIZE_EXCEPTION(tstate, &exception_type, &exception_value, NULL);
+    ASSERT_NORMALIZED_EXCEPTION_VALUE_X(exception_value);
+    tstate->current_exception = exception_value;
 
+#if _DEBUG_EXCEPTIONS
+    PRINT_STRING("SET_CURRENT_EXCEPTION_TYPE0_VALUE1:\n");
+    PRINT_CURRENT_EXCEPTION();
+#endif
+
+    Py_XDECREF(old_exception_value);
 #endif
+}
 
 // Helper that sets the current thread exception, and has no reference passed.
 // Same as CPython API PyErr_SetString
@@ -466,7 +518,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;
         }
@@ -517,106 +569,518 @@ NUITKA_MAY_BE_UNUSED static inline void RESTORE_FRAME_EXCEPTION(PyThreadState *t
 
 #endif
 
-// Similar to PyException_SetTraceback, only done for Python3.
+// Similar to "PyException_SetTraceback", only done for Python3.
 #if PYTHON_VERSION < 0x300
 #define ATTACH_TRACEBACK_TO_EXCEPTION_VALUE(exception_value, exception_tb) ;
 #else
 NUITKA_MAY_BE_UNUSED static inline void ATTACH_TRACEBACK_TO_EXCEPTION_VALUE(PyObject *exception_value,
                                                                             PyTracebackObject *exception_tb) {
     CHECK_OBJECT(exception_value);
-    CHECK_OBJECT(exception_tb);
+    CHECK_OBJECT_X(exception_tb);
 
-    if (exception_tb == (PyTracebackObject *)Py_None || exception_tb == NULL) {
-        return;
+    if (exception_tb == (PyTracebackObject *)Py_None) {
+        exception_tb = NULL;
     }
 
     assert(PyExceptionInstance_Check(exception_value));
-    assert(PyTraceBack_Check(exception_tb));
+    assert(exception_tb == NULL || PyTraceBack_Check(exception_tb));
 
     PyBaseExceptionObject *e = (PyBaseExceptionObject *)exception_value;
 
     PyObject *old = e->traceback;
-    Py_INCREF(exception_tb);
+    Py_XINCREF(exception_tb);
     e->traceback = (PyObject *)exception_tb;
     Py_XDECREF(old);
 }
 
 // Much like "PyException_GetTraceback", but does not give a reference.
 NUITKA_MAY_BE_UNUSED static inline PyTracebackObject *GET_EXCEPTION_TRACEBACK(PyObject *exception_value) {
+    CHECK_OBJECT(exception_value);
     assert(PyExceptionInstance_Check(exception_value));
 
     PyBaseExceptionObject *exc_object = (PyBaseExceptionObject *)(exception_value);
     return (PyTracebackObject *)exc_object->traceback;
 }
+
 #endif
 
+NUITKA_MAY_BE_UNUSED static bool EXCEPTION_MATCH_BOOL_SINGLE(PyThreadState *tstate, PyObject *exception_value,
+                                                             PyObject *exception_checked);
+
+NUITKA_MAY_BE_UNUSED static bool _CHECK_AND_CLEAR_EXCEPTION_OCCURRED(PyThreadState *tstate, PyObject *exception_type) {
 #if PYTHON_VERSION < 0x3c0
-extern void Nuitka_Err_NormalizeException(PyThreadState *tstate, PyObject **exc, PyObject **val,
-                                          PyTracebackObject **tb);
+    PyObject *exception_current = tstate->curexc_type;
+#else
+    PyObject *exception_current = tstate->current_exception;
+    ASSERT_NORMALIZED_EXCEPTION_VALUE_X(exception_current);
+#endif
+    if (exception_current == NULL) {
+        return true;
+    } else if (EXCEPTION_MATCH_BOOL_SINGLE(tstate, exception_current, exception_type)) {
+        CHECK_OBJECT(exception_current);
 
-// Normalize an exception.
-NUITKA_MAY_BE_UNUSED static inline void NORMALIZE_EXCEPTION(PyThreadState *tstate, PyObject **exception_type,
-                                                            PyObject **exception_value,
-                                                            PyTracebackObject **exception_tb) {
-#if _DEBUG_EXCEPTIONS
-    PRINT_STRING("NORMALIZE_EXCEPTION: Enter\n");
-    PRINT_EXCEPTION(*exception_type, *exception_value, *exception_tb);
+#if PYTHON_VERSION < 0x3c0
+        // Clear the exception first, we believe we know it doesn't have side effects.
+        Py_DECREF(exception_current);
+        tstate->curexc_type = NULL;
+
+        PyObject *old_value = tstate->curexc_value;
+        PyObject *old_tb = tstate->curexc_traceback;
+
+        tstate->curexc_value = NULL;
+        tstate->curexc_traceback = NULL;
+
+        Py_XDECREF(old_value);
+        Py_XDECREF(old_tb);
+#else
+        tstate->current_exception = NULL;
+        Py_DECREF(exception_current);
 #endif
-    CHECK_OBJECT_X(*exception_type);
-    CHECK_OBJECT_X(*exception_value);
-    if (exception_tb) {
-        CHECK_OBJECT_X(*exception_tb);
+
+        return true;
+    } else {
+        return false;
     }
+}
 
-    // TODO: Often we already know this to be true.
-    if (*exception_type != Py_None && *exception_type != NULL) {
-        Nuitka_Err_NormalizeException(tstate, exception_type, exception_value, exception_tb);
+/* Special helper that checks for StopIteration and if so clears it, only
+   indicating if it was set in the return value.
+
+   Equivalent to if(PyErr_ExceptionMatches(PyExc_StopIteration) PyErr_Clear();
+
+   If error is raised by built-in function next() and an iterator’s __next__()
+   method to signal that there are no further items produced by the iterator then
+   it resets the TSTATE to NULL and returns True else return False
+
+*/
+NUITKA_MAY_BE_UNUSED static bool CHECK_AND_CLEAR_STOP_ITERATION_OCCURRED(PyThreadState *tstate) {
+    return _CHECK_AND_CLEAR_EXCEPTION_OCCURRED(tstate, PyExc_StopIteration);
+}
+
+/* Special helper that checks for KeyError and if so clears it, only
+   indicating if it was set in the return value.
+
+   Equivalent to if(PyErr_ExceptionMatches(PyExc_KeyError) PyErr_Clear();
+
+*/
+NUITKA_MAY_BE_UNUSED static bool CHECK_AND_CLEAR_KEY_ERROR_OCCURRED(PyThreadState *tstate) {
+    return _CHECK_AND_CLEAR_EXCEPTION_OCCURRED(tstate, PyExc_KeyError);
+}
+
+NUITKA_MAY_BE_UNUSED static bool CHECK_AND_CLEAR_ATTRIBUTE_ERROR_OCCURRED(PyThreadState *tstate) {
+    return _CHECK_AND_CLEAR_EXCEPTION_OCCURRED(tstate, PyExc_AttributeError);
+}
+
+#if PYTHON_VERSION >= 0x3c0
+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) {
+    PyBaseExceptionObject *self;
+
+    PyTypeObject *type_object = (PyTypeObject *)type;
+
+    self = (PyBaseExceptionObject *)(type_object->tp_alloc(type_object, 0));
+
+    self->dict = NULL;
+    self->notes = NULL;
+    self->traceback = self->cause = self->context = NULL;
+    self->suppress_context = 0;
+
+    assert(arg != NULL);
+
+    if (!PyTuple_Check(arg)) {
+        self->args = MAKE_TUPLE1(tstate, arg);
+    } else {
+        self->args = Py_NewRef(arg);
     }
 
-#if _DEBUG_EXCEPTIONS
-    PRINT_STRING("NORMALIZE_EXCEPTION: Leave\n");
-    PRINT_EXCEPTION(*exception_type, *exception_value, exception_tb ? *exception_tb : NULL);
-#endif
+    return (PyObject *)self;
+}
+#else
+
+extern PyObject *CALL_FUNCTION_WITH_SINGLE_ARG(PyThreadState *tstate, PyObject *called, PyObject *arg);
+
+NUITKA_MAY_BE_UNUSED static PyObject *MAKE_EXCEPTION_FROM_TYPE_ARG0(PyThreadState *tstate, PyObject *type,
+                                                                    PyObject *arg) {
+    return CALL_FUNCTION_WITH_SINGLE_ARG(tstate, type, arg);
 }
+
 #endif
 
-// Publish an exception, erasing the values of the variables.
-NUITKA_MAY_BE_UNUSED static inline void PUBLISH_CURRENT_EXCEPTION(PyThreadState *tstate, PyObject **exception_type,
-                                                                  PyObject **exception_value,
-                                                                  PyTracebackObject **exception_tb) {
+#if PYTHON_VERSION < 0x3c0
+struct Nuitka_ExceptionPreservationItem {
+    PyObject *exception_type;
+    PyObject *exception_value;
+    PyTracebackObject *exception_tb;
+};
+
+static const struct Nuitka_ExceptionPreservationItem Empty_Nuitka_ExceptionPreservationItem = {0};
+
+// Fetch the current exception into state, transfers reference coming from tstate ownership. Old values are overwritten.
+NUITKA_MAY_BE_UNUSED static void FETCH_ERROR_OCCURRED_STATE(PyThreadState *tstate,
+                                                            struct Nuitka_ExceptionPreservationItem *exception_state) {
+    FETCH_ERROR_OCCURRED(tstate, &exception_state->exception_type, &exception_state->exception_value,
+                         &exception_state->exception_tb);
+}
+
+// Restore the current exception from state, transfers reference from state to tstate ownership.
+NUITKA_MAY_BE_UNUSED static void
+RESTORE_ERROR_OCCURRED_STATE(PyThreadState *tstate, struct Nuitka_ExceptionPreservationItem *exception_state) {
+    RESTORE_ERROR_OCCURRED(tstate, exception_state->exception_type, exception_state->exception_value,
+                           exception_state->exception_tb);
+}
+
+NUITKA_MAY_BE_UNUSED static void
+FETCH_ERROR_OCCURRED_STATE_UNTRACED(PyThreadState *tstate, struct Nuitka_ExceptionPreservationItem *exception_state) {
+    FETCH_ERROR_OCCURRED_UNTRACED(tstate, &exception_state->exception_type, &exception_state->exception_value,
+                                  &exception_state->exception_tb);
+}
+
+NUITKA_MAY_BE_UNUSED static void
+RESTORE_ERROR_OCCURRED_STATE_UNTRACED(PyThreadState *tstate, struct Nuitka_ExceptionPreservationItem *exception_state) {
+    RESTORE_ERROR_OCCURRED_UNTRACED(tstate, exception_state->exception_type, exception_state->exception_value,
+                                    exception_state->exception_tb);
+}
+
+NUITKA_MAY_BE_UNUSED static void
+ASSERT_SAME_EXCEPTION_STATE(struct Nuitka_ExceptionPreservationItem const *exception_state1,
+                            struct Nuitka_ExceptionPreservationItem const *exception_state2) {
+    assert(exception_state1->exception_type == exception_state2->exception_type);
+    assert(exception_state1->exception_value == exception_state2->exception_value);
+    assert(exception_state1->exception_tb == exception_state2->exception_tb);
+}
+
+NUITKA_MAY_BE_UNUSED static void
+ASSERT_EMPTY_EXCEPTION_STATE(struct Nuitka_ExceptionPreservationItem const *exception_state) {
+    assert(exception_state->exception_type == NULL);
+    assert(exception_state->exception_value == NULL);
+    assert(exception_state->exception_tb == NULL);
+}
+
+NUITKA_MAY_BE_UNUSED static void INIT_ERROR_OCCURRED_STATE(struct Nuitka_ExceptionPreservationItem *exception_state) {
+    exception_state->exception_type = NULL;
+    exception_state->exception_value = NULL;
+    exception_state->exception_tb = NULL;
+}
+
+NUITKA_MAY_BE_UNUSED static void
+RELEASE_ERROR_OCCURRED_STATE(struct Nuitka_ExceptionPreservationItem *exception_state) {
+    CHECK_OBJECT(exception_state->exception_type);
+    CHECK_OBJECT_X(exception_state->exception_value);
+    CHECK_OBJECT_X(exception_state->exception_tb);
+    Py_DECREF(exception_state->exception_type);
+    Py_XDECREF(exception_state->exception_value);
+    Py_XDECREF(exception_state->exception_tb);
+}
+
+NUITKA_MAY_BE_UNUSED static void
+RELEASE_ERROR_OCCURRED_STATE_X(struct Nuitka_ExceptionPreservationItem *exception_state) {
+    CHECK_OBJECT_X(exception_state->exception_type);
+    CHECK_OBJECT_X(exception_state->exception_value);
+    CHECK_OBJECT_X(exception_state->exception_tb);
+
+    Py_XDECREF(exception_state->exception_type);
+    Py_XDECREF(exception_state->exception_value);
+    Py_XDECREF(exception_state->exception_tb);
+}
+
+NUITKA_MAY_BE_UNUSED static void SET_EXCEPTION_PRESERVATION_STATE_FROM_ARGS(
+    PyThreadState *tstate, struct Nuitka_ExceptionPreservationItem *exception_state, PyObject *exception_type,
+    PyObject *exception_value, PyTracebackObject *exception_tb) {
+    Py_INCREF(exception_type);
+    Py_XINCREF(exception_value);
+    Py_XINCREF(exception_tb);
+
+    exception_state->exception_type = exception_type;
+    exception_state->exception_value = exception_value;
+    exception_state->exception_tb = exception_tb;
+}
+
+NUITKA_MAY_BE_UNUSED static void
+ASSIGN_ARGS_FROM_EXCEPTION_PRESERVATION_STATE(struct Nuitka_ExceptionPreservationItem *exception_state,
+                                              PyObject **exception_type, PyObject **exception_value,
+                                              PyTracebackObject **exception_tb) {
+
+    *exception_type = exception_state->exception_type;
+    Py_INCREF(*exception_type);
+    *exception_value = exception_state->exception_value;
+    Py_XINCREF(*exception_value);
+    *exception_tb = exception_state->exception_tb;
+    Py_XINCREF(*exception_tb);
+}
+
+NUITKA_MAY_BE_UNUSED static PyTracebackObject *
+GET_EXCEPTION_STATE_TRACEBACK(struct Nuitka_ExceptionPreservationItem *exception_state) {
+    return exception_state->exception_tb;
+}
+
+// Transfer ownership of the traceback to the exception state.
+NUITKA_MAY_BE_UNUSED static void SET_EXCEPTION_STATE_TRACEBACK(struct Nuitka_ExceptionPreservationItem *exception_state,
+                                                               PyTracebackObject *exception_tb) {
+    CHECK_OBJECT_X(exception_state->exception_tb);
+    CHECK_OBJECT_X(exception_tb);
+
+    Py_XDECREF(exception_state->exception_tb);
+    exception_state->exception_tb = exception_tb;
+}
+
+NUITKA_MAY_BE_UNUSED static bool HAS_EXCEPTION_STATE(struct Nuitka_ExceptionPreservationItem const *exception_state) {
+    return exception_state->exception_type != NULL;
+}
+
+NUITKA_MAY_BE_UNUSED static bool
+EXCEPTION_STATE_MATCH_BOOL_SINGLE(PyThreadState *tstate, struct Nuitka_ExceptionPreservationItem *exception_state,
+                                  PyObject *exception_checked) {
+    return EXCEPTION_MATCH_BOOL_SINGLE(tstate, exception_state->exception_type, exception_checked);
+}
+
+NUITKA_MAY_BE_UNUSED inline static void
+CHECK_EXCEPTION_STATE(struct Nuitka_ExceptionPreservationItem const *exception_state) {
+    CHECK_OBJECT(exception_state->exception_type);
+    CHECK_OBJECT_X(exception_state->exception_value);
+    CHECK_OBJECT_X(exception_state->exception_tb);
+}
+
+NUITKA_MAY_BE_UNUSED inline static void
+CHECK_EXCEPTION_STATE_X(struct Nuitka_ExceptionPreservationItem const *exception_state) {
+    CHECK_OBJECT_X(exception_state->exception_type);
+    CHECK_OBJECT_X(exception_state->exception_value);
+    CHECK_OBJECT_X(exception_state->exception_tb);
+}
+
+#else
+struct Nuitka_ExceptionPreservationItem {
+    PyObject *exception_value;
+};
+
+static const struct Nuitka_ExceptionPreservationItem Empty_Nuitka_ExceptionPreservationItem = {0};
+
+// Fetch the current exception into state, transfers reference coming from tstate ownership. Old value is overwritten.
+NUITKA_MAY_BE_UNUSED static void FETCH_ERROR_OCCURRED_STATE(PyThreadState *tstate,
+                                                            struct Nuitka_ExceptionPreservationItem *exception_state) {
+    exception_state->exception_value = tstate->current_exception;
+    ASSERT_NORMALIZED_EXCEPTION_VALUE_X(exception_state->exception_value);
+
 #if _DEBUG_EXCEPTIONS
-    PRINT_STRING("PUBLISH_CURRENT_EXCEPTION:\n");
+    PRINT_STRING("FETCH_ERROR_OCCURRED_STATE:\n");
+    PRINT_CURRENT_EXCEPTION();
 #endif
-    NORMALIZE_EXCEPTION(tstate, exception_type, exception_value, exception_tb);
-    ATTACH_TRACEBACK_TO_EXCEPTION_VALUE(*exception_value, *exception_tb);
 
-    struct Nuitka_ExceptionStackItem exc_state;
+    tstate->current_exception = NULL;
+}
 
-#if PYTHON_VERSION < 0x3b0
-    exc_state.exception_type = *exception_type;
+NUITKA_MAY_BE_UNUSED static void
+FETCH_ERROR_OCCURRED_STATE_UNTRACED(PyThreadState *tstate, struct Nuitka_ExceptionPreservationItem *exception_state) {
+    exception_state->exception_value = tstate->current_exception;
+    tstate->current_exception = NULL;
+
+    ASSERT_NORMALIZED_EXCEPTION_VALUE_X(exception_state->exception_value);
+}
+
+NUITKA_MAY_BE_UNUSED static void
+RESTORE_ERROR_OCCURRED_STATE(PyThreadState *tstate, struct Nuitka_ExceptionPreservationItem *exception_state) {
+    PyObject *old_exception_value = tstate->current_exception;
+    ASSERT_NORMALIZED_EXCEPTION_VALUE_X(old_exception_value);
+
+    ASSERT_NORMALIZED_EXCEPTION_VALUE_X(exception_state->exception_value);
+    tstate->current_exception = exception_state->exception_value;
+
+#if _DEBUG_EXCEPTIONS
+    PRINT_STRING("RESTORE_ERROR_OCCURRED_STATE:\n");
+    PRINT_CURRENT_EXCEPTION();
 #endif
-    exc_state.exception_value = *exception_value;
-#if PYTHON_VERSION < 0x3b0
-    exc_state.exception_tb = *exception_tb;
+
+    Py_XDECREF(old_exception_value);
+}
+
+NUITKA_MAY_BE_UNUSED static void
+RESTORE_ERROR_OCCURRED_STATE_UNTRACED(PyThreadState *tstate, struct Nuitka_ExceptionPreservationItem *exception_state) {
+    PyObject *old_exception_value = tstate->current_exception;
+    ASSERT_NORMALIZED_EXCEPTION_VALUE_X(old_exception_value);
+
+    ASSERT_NORMALIZED_EXCEPTION_VALUE_X(exception_state->exception_value);
+    tstate->current_exception = exception_state->exception_value;
+
+    Py_XDECREF(old_exception_value);
+}
+
+NUITKA_MAY_BE_UNUSED static void
+ASSERT_SAME_EXCEPTION_STATE(struct Nuitka_ExceptionPreservationItem *exception_state1,
+                            struct Nuitka_ExceptionPreservationItem *exception_state2) {
+    assert(exception_state1->exception_value == exception_state2->exception_value);
+}
+
+NUITKA_MAY_BE_UNUSED static void
+ASSERT_EMPTY_EXCEPTION_STATE(struct Nuitka_ExceptionPreservationItem const *exception_state) {
+    assert(exception_state->exception_value == NULL);
+}
+
+NUITKA_MAY_BE_UNUSED static void INIT_ERROR_OCCURRED_STATE(struct Nuitka_ExceptionPreservationItem *exception_state) {
+    exception_state->exception_value = NULL;
+}
+
+NUITKA_MAY_BE_UNUSED static void
+RELEASE_ERROR_OCCURRED_STATE(struct Nuitka_ExceptionPreservationItem *exception_state) {
+    CHECK_OBJECT(exception_state->exception_value);
+    Py_DECREF(exception_state->exception_value);
+}
+
+NUITKA_MAY_BE_UNUSED static void
+RELEASE_ERROR_OCCURRED_STATE_X(struct Nuitka_ExceptionPreservationItem *exception_state) {
+    CHECK_OBJECT_X(exception_state->exception_value);
+    Py_XDECREF(exception_state->exception_value);
+}
+
+NUITKA_MAY_BE_UNUSED static void SET_EXCEPTION_PRESERVATION_STATE_FROM_ARGS(
+    PyThreadState *tstate, struct Nuitka_ExceptionPreservationItem *exception_state, PyObject *exception_type,
+    PyObject *exception_value, PyTracebackObject *exception_tb) {
+
+    Py_XINCREF(exception_type);
+    Py_XINCREF(exception_value);
+    Py_XINCREF(exception_tb);
+
+    NORMALIZE_EXCEPTION(tstate, &exception_type, &exception_value, &exception_tb);
+    ASSERT_NORMALIZED_EXCEPTION_VALUE(exception_value);
+
+    exception_state->exception_value = exception_value;
+    Py_INCREF(exception_value);
+
+    ATTACH_TRACEBACK_TO_EXCEPTION_VALUE(exception_value, exception_tb);
+
+    Py_XDECREF(exception_type);
+    Py_XDECREF(exception_value);
+    Py_XDECREF(exception_tb);
+}
+
+NUITKA_MAY_BE_UNUSED static void
+ASSIGN_ARGS_FROM_EXCEPTION_PRESERVATION_STATE(struct Nuitka_ExceptionPreservationItem *exception_state,
+                                              PyObject **exception_type, PyObject **exception_value,
+                                              PyTracebackObject **exception_tb) {
+
+    *exception_value = exception_state->exception_value;
+
+    if (*exception_value) {
+        Py_INCREF(*exception_value);
+
+        *exception_type = (PyObject *)PyExceptionInstance_Class(*exception_value);
+        Py_INCREF(*exception_type);
+        *exception_tb = GET_EXCEPTION_TRACEBACK(*exception_value);
+        Py_XINCREF(*exception_tb);
+    } else {
+        *exception_type = NULL;
+        *exception_tb = NULL;
+    }
+}
+
+NUITKA_MAY_BE_UNUSED static PyTracebackObject *
+GET_EXCEPTION_STATE_TRACEBACK(struct Nuitka_ExceptionPreservationItem *exception_state) {
+    return GET_EXCEPTION_TRACEBACK(exception_state->exception_value);
+}
+
+// Transfer ownership of the traceback to the exception state.
+NUITKA_MAY_BE_UNUSED static void SET_EXCEPTION_STATE_TRACEBACK(struct Nuitka_ExceptionPreservationItem *exception_state,
+                                                               PyTracebackObject *exception_tb) {
+    ATTACH_TRACEBACK_TO_EXCEPTION_VALUE(exception_state->exception_value, exception_tb);
+    Py_XDECREF(exception_tb);
+    CHECK_OBJECT_X(exception_tb);
+}
+
+NUITKA_MAY_BE_UNUSED static bool HAS_EXCEPTION_STATE(struct Nuitka_ExceptionPreservationItem const *exception_state) {
+    return exception_state->exception_value != NULL;
+}
+
+NUITKA_MAY_BE_UNUSED static bool
+EXCEPTION_STATE_MATCH_BOOL_SINGLE(PyThreadState *tstate, struct Nuitka_ExceptionPreservationItem const *exception_state,
+                                  PyObject *exception_checked) {
+    return EXCEPTION_MATCH_BOOL_SINGLE(tstate, exception_state->exception_value, exception_checked);
+}
+
+NUITKA_MAY_BE_UNUSED inline static void
+CHECK_EXCEPTION_STATE(struct Nuitka_ExceptionPreservationItem const *exception_state) {
+    ASSERT_NORMALIZED_EXCEPTION_VALUE(exception_state->exception_value);
+}
+
+NUITKA_MAY_BE_UNUSED inline static void
+CHECK_EXCEPTION_STATE_X(struct Nuitka_ExceptionPreservationItem const *exception_state) {
+    ASSERT_NORMALIZED_EXCEPTION_VALUE_X(exception_state->exception_value);
+}
+
 #endif
 
-    SET_CURRENT_EXCEPTION(tstate, &exc_state);
+NUITKA_MAY_BE_UNUSED inline static void SET_EXCEPTION_PRESERVATION_STATE_FROM_TYPE0(
+    PyThreadState *tstate, struct Nuitka_ExceptionPreservationItem *exception_state, PyObject *exception_type) {
 
-#if PYTHON_VERSION >= 0x3b0
-    // TODO: We shouldn't get these in the first place, we don't transfer the
-    // type anymore and the exception tb could come in already attached.
-    Py_DECREF(*exception_type);
-    Py_XDECREF(*exception_tb);
+    SET_EXCEPTION_PRESERVATION_STATE_FROM_ARGS(tstate, exception_state, exception_type, NULL, NULL);
+}
+
+extern PyObject *CALL_FUNCTION_WITH_SINGLE_ARG(PyThreadState *tstate, PyObject *called, PyObject *arg);
+
+NUITKA_MAY_BE_UNUSED inline static void
+SET_EXCEPTION_PRESERVATION_STATE_FROM_TYPE0_VALUE1(PyThreadState *tstate,
+                                                   struct Nuitka_ExceptionPreservationItem *exception_state,
+                                                   PyObject *exception_type, PyObject *exception_value) {
+#if PYTHON_VERSION < 0x3c0
+    Py_INCREF(exception_type);
+
+    exception_state->exception_type = exception_type;
+    exception_state->exception_value = exception_value;
+    exception_state->exception_tb = NULL;
+#else
+    PyObject *exc = CALL_FUNCTION_WITH_SINGLE_ARG(tstate, exception_type, exception_value);
+    exception_state->exception_value = exc;
+    Py_DECREF(exception_value);
 #endif
+}
 
-    *exception_type = NULL;
-    *exception_value = NULL;
-    *exception_tb = NULL;
+NUITKA_MAY_BE_UNUSED inline static void
+SET_EXCEPTION_PRESERVATION_STATE_FROM_TYPE0_VALUE1_NORMALIZED(PyThreadState *tstate,
+                                                              struct Nuitka_ExceptionPreservationItem *exception_state,
+                                                              PyObject *exception_type, PyObject *exception_value) {
+#if PYTHON_VERSION < 0x3c0
+    SET_EXCEPTION_PRESERVATION_STATE_FROM_TYPE0_VALUE1(tstate, exception_state, exception_type, exception_value);
+#else
+    exception_state->exception_value = exception_value;
+#endif
 }
 
+NUITKA_MAY_BE_UNUSED inline static void
+SET_EXCEPTION_PRESERVATION_STATE_FROM_TYPE0_VALUE0(PyThreadState *tstate,
+                                                   struct Nuitka_ExceptionPreservationItem *exception_state,
+                                                   PyObject *exception_type, PyObject *exception_value) {
+    // TODO: Add variants for normalized values only.
+    SET_EXCEPTION_PRESERVATION_STATE_FROM_ARGS(tstate, exception_state, exception_type, exception_value, NULL);
+}
+
+NUITKA_MAY_BE_UNUSED inline static void
+SET_EXCEPTION_PRESERVATION_STATE_FROM_TYPE0_STR(PyThreadState *tstate,
+                                                struct Nuitka_ExceptionPreservationItem *exception_state,
+                                                PyObject *exception_type, char const *value) {
+    PyObject *exception_value = Nuitka_String_FromString(value);
+
+    SET_EXCEPTION_PRESERVATION_STATE_FROM_TYPE0_VALUE1(tstate, exception_state, exception_type, exception_value);
+}
+
+#define SET_EXCEPTION_PRESERVATION_STATE_FROM_TYPE0_FORMAT1(tstate, exception_state, exception_type, message, arg1)    \
+    {                                                                                                                  \
+        PyObject *exception_value = Nuitka_String_FromFormat(message, arg1);                                           \
+        CHECK_OBJECT(exception_value);                                                                                 \
+        SET_EXCEPTION_PRESERVATION_STATE_FROM_TYPE0_VALUE1(tstate, exception_state, exception_type, exception_value);  \
+    }
+
+#define SET_EXCEPTION_PRESERVATION_STATE_FROM_TYPE0_FORMAT2(tstate, exception_state, exception_type, message, arg1,    \
+                                                            arg2)                                                      \
+    {                                                                                                                  \
+        PyObject *exception_value = Nuitka_String_FromFormat(message, arg1, arg2);                                     \
+        CHECK_OBJECT(exception_value);                                                                                 \
+        SET_EXCEPTION_PRESERVATION_STATE_FROM_TYPE0_VALUE1(tstate, exception_state, exception_type, exception_value);  \
+    }
+
 NUITKA_MAY_BE_UNUSED static bool EXCEPTION_MATCH_GENERATOR(PyThreadState *tstate, PyObject *exception_value) {
     CHECK_OBJECT(exception_value);
 
+    // TODO: For Python3.12 this must be done differently to be a lot better.
+
     // We need to check the class.
     if (PyExceptionInstance_Check(exception_value)) {
         exception_value = PyExceptionInstance_Class(exception_value);
@@ -629,9 +1093,8 @@ NUITKA_MAY_BE_UNUSED static bool EXCEPTION_MATCH_GENERATOR(PyThreadState *tstate
 
     if (PyExceptionClass_Check(exception_value)) {
         // Save the current exception, if any, we must preserve it.
-        PyObject *save_exception_type, *save_exception_value;
-        PyTracebackObject *save_exception_tb;
-        FETCH_ERROR_OCCURRED(tstate, &save_exception_type, &save_exception_value, &save_exception_tb);
+        struct Nuitka_ExceptionPreservationItem saved_exception_state;
+        FETCH_ERROR_OCCURRED_STATE(tstate, &saved_exception_state);
 
         int res = PyObject_IsSubclass(exception_value, PyExc_GeneratorExit);
 
@@ -651,7 +1114,7 @@ NUITKA_MAY_BE_UNUSED static bool EXCEPTION_MATCH_GENERATOR(PyThreadState *tstate
             PyErr_WriteUnraisable(exception_value);
         }
 
-        RESTORE_ERROR_OCCURRED(tstate, save_exception_type, save_exception_value, save_exception_tb);
+        RESTORE_ERROR_OCCURRED_STATE(tstate, &saved_exception_state);
 
         return res == 1;
     }
@@ -659,6 +1122,15 @@ NUITKA_MAY_BE_UNUSED static bool EXCEPTION_MATCH_GENERATOR(PyThreadState *tstate
     return false;
 }
 
+NUITKA_MAY_BE_UNUSED static bool
+EXCEPTION_STATE_MATCH_GENERATOR(PyThreadState *tstate, struct Nuitka_ExceptionPreservationItem *exception_state) {
+#if PYTHON_VERSION < 0x3c0
+    return EXCEPTION_MATCH_GENERATOR(tstate, exception_state->exception_type);
+#else
+    return EXCEPTION_MATCH_GENERATOR(tstate, exception_state->exception_value);
+#endif
+}
+
 NUITKA_MAY_BE_UNUSED static bool EXCEPTION_MATCH_BOOL_SINGLE(PyThreadState *tstate, PyObject *exception_value,
                                                              PyObject *exception_checked) {
     CHECK_OBJECT(exception_value);
@@ -675,11 +1147,13 @@ NUITKA_MAY_BE_UNUSED static bool EXCEPTION_MATCH_BOOL_SINGLE(PyThreadState *tsta
     }
 
     if (PyExceptionClass_Check(exception_value)) {
+#if PYTHON_VERSION < 0x300
         // Save the current exception, if any, we must preserve it.
-        PyObject *save_exception_type, *save_exception_value;
-        PyTracebackObject *save_exception_tb;
-        FETCH_ERROR_OCCURRED(tstate, &save_exception_type, &save_exception_value, &save_exception_tb);
+        struct Nuitka_ExceptionPreservationItem saved_exception_state;
+        FETCH_ERROR_OCCURRED_STATE(tstate, &saved_exception_state);
 
+        // Python3.10 at least uses PyType_IsSubtype and needs no
+        // fetch restore.
         int res = PyObject_IsSubclass(exception_value, exception_checked);
 
         // This function must not fail, so print the error here */
@@ -687,9 +1161,13 @@ NUITKA_MAY_BE_UNUSED static bool EXCEPTION_MATCH_BOOL_SINGLE(PyThreadState *tsta
             PyErr_WriteUnraisable(exception_value);
         }
 
-        RESTORE_ERROR_OCCURRED(tstate, save_exception_type, save_exception_value, save_exception_tb);
+        RESTORE_ERROR_OCCURRED_STATE(tstate, &saved_exception_state);
 
         return res == 1;
+#else
+        int res = Nuitka_Type_IsSubtype((PyTypeObject *)exception_value, (PyTypeObject *)exception_checked);
+        return res == 1;
+#endif
     }
 
     return false;
@@ -711,9 +1189,8 @@ NUITKA_MAY_BE_UNUSED static inline int _EXCEPTION_MATCH_BOOL(PyThreadState *tsta
 #if PYTHON_VERSION < 0x300
     if (PyExceptionClass_Check(exception_class) && PyExceptionClass_Check(exception_checked)) {
         // Save the current exception, if any, we must preserve it.
-        PyObject *save_exception_type, *save_exception_value;
-        PyTracebackObject *save_exception_tb;
-        FETCH_ERROR_OCCURRED(tstate, &save_exception_type, &save_exception_value, &save_exception_tb);
+        struct Nuitka_ExceptionPreservationItem saved_exception_state;
+        FETCH_ERROR_OCCURRED_STATE(tstate, &saved_exception_state);
 
         // Avoid recursion limit being exceeded just then
         int recursion_limit = Py_GetRecursionLimit();
@@ -731,7 +1208,7 @@ NUITKA_MAY_BE_UNUSED static inline int _EXCEPTION_MATCH_BOOL(PyThreadState *tsta
             res = 0;
         }
 
-        RESTORE_ERROR_OCCURRED(tstate, save_exception_type, save_exception_value, save_exception_tb);
+        RESTORE_ERROR_OCCURRED_STATE(tstate, &saved_exception_state);
 
         return res;
     } else {
@@ -795,48 +1272,102 @@ NUITKA_MAY_BE_UNUSED static inline int EXCEPTION_MATCH_BOOL(PyThreadState *tstat
     }
 }
 
-#if PYTHON_VERSION >= 0x300
-// Attach the exception context if necessary.
-NUITKA_MAY_BE_UNUSED static inline void ADD_EXCEPTION_CONTEXT(PyThreadState *tstate, PyObject **exception_type,
-                                                              PyObject **exception_value) {
-    PyObject *context = EXC_VALUE(tstate);
+// Normalize an exception type to a value.
 
-    if (context != NULL) {
-        NORMALIZE_EXCEPTION(tstate, exception_type, exception_value, NULL);
+extern void Nuitka_Err_NormalizeException(PyThreadState *tstate, PyObject **exc, PyObject **val,
+                                          PyTracebackObject **tb);
 
-        Py_INCREF(context);
-        PyException_SetContext(*exception_value, context);
+// Normalize an exception, may release old values and replace them, expects
+// references passed and returns them.
+NUITKA_MAY_BE_UNUSED static inline void NORMALIZE_EXCEPTION(PyThreadState *tstate, PyObject **exception_type,
+                                                            PyObject **exception_value,
+                                                            PyTracebackObject **exception_tb) {
+#if _DEBUG_EXCEPTIONS
+    PRINT_STRING("NORMALIZE_EXCEPTION: Enter\n");
+    PRINT_EXCEPTION(*exception_type, *exception_value, *exception_tb);
+#endif
+    CHECK_OBJECT_X(*exception_type);
+    CHECK_OBJECT_X(*exception_value);
+    if (exception_tb) {
+        CHECK_OBJECT_X(*exception_tb);
     }
-}
+
+    // TODO: Often we already know this to be true.
+    if (*exception_type != Py_None && *exception_type != NULL) {
+        Nuitka_Err_NormalizeException(tstate, exception_type, exception_value, exception_tb);
+    }
+
+#if _DEBUG_EXCEPTIONS
+    PRINT_STRING("NORMALIZE_EXCEPTION: Leave\n");
+    PRINT_EXCEPTION(*exception_type, *exception_value, exception_tb ? *exception_tb : NULL);
 #endif
+}
 
-NUITKA_MAY_BE_UNUSED static bool _CHECK_AND_CLEAR_EXCEPTION_OCCURRED(PyThreadState *tstate, PyObject *exception_type) {
 #if PYTHON_VERSION < 0x3c0
-    PyObject *exception_current = tstate->curexc_type;
-#else
-    PyObject *exception_current = tstate->current_exception;
+// Normalize an exception, may release old values and replace them, expects
+// references passed and returns them.
+static inline void NORMALIZE_EXCEPTION_STATE(PyThreadState *tstate,
+                                             struct Nuitka_ExceptionPreservationItem *exception_state) {
+    CHECK_EXCEPTION_STATE_X(exception_state);
+
+    NORMALIZE_EXCEPTION(tstate, &exception_state->exception_type, &exception_state->exception_value,
+                        &exception_state->exception_tb);
+}
+#endif
+
+extern PyObject *CALL_FUNCTION_NO_ARGS(PyThreadState *tstate, PyObject *called);
 
+// Publish an exception, erasing the values of the variables.
+NUITKA_MAY_BE_UNUSED static inline void
+PUBLISH_CURRENT_EXCEPTION(PyThreadState *tstate, struct Nuitka_ExceptionPreservationItem *exception_state) {
+#if _DEBUG_EXCEPTIONS
+    PRINT_STRING("PUBLISH_CURRENT_EXCEPTION:\n");
+    PRINT_EXCEPTION_STATE(exception_state);
 #endif
-    if (exception_current == NULL) {
-        return true;
-    } else if (EXCEPTION_MATCH_BOOL_SINGLE(tstate, exception_current, exception_type)) {
-        // Clear the exception first, we believe we know it doesn't have side effects.
-        Py_DECREF(exception_current);
 
 #if PYTHON_VERSION < 0x3c0
-        tstate->curexc_type = NULL;
+    NORMALIZE_EXCEPTION_STATE(tstate, exception_state);
+    ATTACH_TRACEBACK_TO_EXCEPTION_VALUE(exception_state->exception_value, exception_state->exception_tb);
+#endif
 
-        PyObject *old_value = tstate->curexc_value;
-        PyObject *old_tb = tstate->curexc_traceback;
+    struct Nuitka_ExceptionStackItem exc_state;
 
-        tstate->curexc_value = NULL;
-        tstate->curexc_traceback = NULL;
+#if PYTHON_VERSION < 0x3b0
+    exc_state.exception_type = exception_state->exception_type;
+#endif
+    exc_state.exception_value = exception_state->exception_value;
+#if PYTHON_VERSION < 0x3b0
+    exc_state.exception_tb = exception_state->exception_tb;
+#endif
 
-        Py_XDECREF(old_value);
-        Py_XDECREF(old_tb);
+    SET_CURRENT_EXCEPTION(tstate, &exc_state);
+
+#if PYTHON_VERSION >= 0x3b0 && PYTHON_VERSION < 0x3c0
+    // TODO: We shouldn't get these in the first place, we don't transfer the
+    // type anymore and the exception tb could come in already attached.
+    Py_DECREF(exception_state->exception_type);
+    Py_XDECREF(exception_state->exception_tb);
+#endif
+
+    INIT_ERROR_OCCURRED_STATE(exception_state);
+}
+
+NUITKA_MAY_BE_UNUSED static bool
+_CHECK_AND_CLEAR_EXCEPTION_STATE(PyThreadState *tstate, struct Nuitka_ExceptionPreservationItem *exception_state,
+                                 PyObject *exception_type) {
+#if PYTHON_VERSION < 0x3c0
+    PyObject *exception_current = exception_state->exception_type;
 #else
-        tstate->current_exception = NULL;
+    PyObject *exception_current = exception_state->exception_value;
+    ASSERT_NORMALIZED_EXCEPTION_VALUE_X(exception_current);
 #endif
+    if (exception_current == NULL) {
+        return true;
+    } else if (EXCEPTION_MATCH_BOOL_SINGLE(tstate, exception_current, exception_type)) {
+        CHECK_OBJECT(exception_current);
+
+        RELEASE_ERROR_OCCURRED_STATE(exception_state);
+        INIT_ERROR_OCCURRED_STATE(exception_state);
 
         return true;
     } else {
@@ -844,69 +1375,84 @@ NUITKA_MAY_BE_UNUSED static bool _CHECK_AND_CLEAR_EXCEPTION_OCCURRED(PyThreadSta
     }
 }
 
-/* Special helper that checks for StopIteration and if so clears it, only
-   indicating if it was set in the return value.
+// TODO: Get rid of "CHECK_AND_CLEAR_STOP_ITERATION_OCCURRED" and rename this to
+// its name.
+NUITKA_MAY_BE_UNUSED static bool
+CHECK_AND_CLEAR_STOP_ITERATION_STATE(PyThreadState *tstate, struct Nuitka_ExceptionPreservationItem *exception_state) {
+    return _CHECK_AND_CLEAR_EXCEPTION_STATE(tstate, exception_state, PyExc_StopIteration);
+}
 
-   Equivalent to if(PyErr_ExceptionMatches(PyExc_StopIteration) PyErr_Clear();
+// Format a UnboundLocalError exception for a variable name. TODO: This is more
+// for "raising.h" it seems.
+extern void FORMAT_UNBOUND_LOCAL_ERROR(PyThreadState *tstate, struct Nuitka_ExceptionPreservationItem *exception_state,
+                                       PyObject *variable_name);
 
-   If error is raised by built-in function next() and an iterator’s __next__()
-   method to signal that there are no further items produced by the iterator then
-   it resets the TSTATE to NULL and returns True else return False
+extern void FORMAT_UNBOUND_CLOSURE_ERROR(PyThreadState *tstate,
+                                         struct Nuitka_ExceptionPreservationItem *exception_state,
+                                         PyObject *variable_name);
 
-*/
-NUITKA_MAY_BE_UNUSED static bool CHECK_AND_CLEAR_STOP_ITERATION_OCCURRED(PyThreadState *tstate) {
-    return _CHECK_AND_CLEAR_EXCEPTION_OCCURRED(tstate, PyExc_StopIteration);
+#if PYTHON_VERSION >= 0x300
+static inline PyBaseExceptionObject *_PyBaseExceptionObject_cast(PyObject *exc) {
+    assert(PyExceptionInstance_Check(exc));
+    return (PyBaseExceptionObject *)exc;
 }
 
-/* Special helper that checks for KeyError and if so clears it, only
-   indicating if it was set in the return value.
+// Exception context, replacement for "PyException_GetContext", it however gives no
+// reference.
+NUITKA_MAY_BE_UNUSED static inline PyObject *Nuitka_Exception_GetContext(PyObject *self) {
+    return _PyBaseExceptionObject_cast(self)->context;
+}
 
-   Equivalent to if(PyErr_ExceptionMatches(PyExc_KeyError) PyErr_Clear();
+// Exception context, replacement for "PyException_SetContext" it however doesn't
+// consume a reference.
+NUITKA_MAY_BE_UNUSED static inline void Nuitka_Exception_SetContext(PyObject *self, PyObject *context) {
+    CHECK_OBJECT(context);
 
-*/
-NUITKA_MAY_BE_UNUSED static bool CHECK_AND_CLEAR_KEY_ERROR_OCCURRED(PyThreadState *tstate) {
-    return _CHECK_AND_CLEAR_EXCEPTION_OCCURRED(tstate, PyExc_KeyError);
+    Py_INCREF(context);
+    Py_XSETREF(_PyBaseExceptionObject_cast(self)->context, context);
 }
 
-NUITKA_MAY_BE_UNUSED static bool CHECK_AND_CLEAR_ATTRIBUTE_ERROR_OCCURRED(PyThreadState *tstate) {
-    return _CHECK_AND_CLEAR_EXCEPTION_OCCURRED(tstate, PyExc_AttributeError);
+NUITKA_MAY_BE_UNUSED static inline void Nuitka_Exception_DeleteContext(PyObject *self) {
+    Py_XSETREF(_PyBaseExceptionObject_cast(self)->context, NULL);
 }
 
-// Format a NameError exception for a variable name.
-extern void FORMAT_NAME_ERROR(PyObject **exception_type, PyObject **exception_value, PyObject *variable_name);
+#if PYTHON_VERSION >= 0x300
+// Attach the exception context if necessary.
+NUITKA_MAY_BE_UNUSED static inline void
+ADD_EXCEPTION_CONTEXT(PyThreadState *tstate, struct Nuitka_ExceptionPreservationItem *exception_state) {
+    PyObject *context = EXC_VALUE(tstate);
 
-#if PYTHON_VERSION < 0x340
-// Same as FORMAT_NAME_ERROR with different wording, sometimes used for older Python version.
-extern void FORMAT_GLOBAL_NAME_ERROR(PyObject **exception_type, PyObject **exception_value, PyObject *variable_name);
+    if (context != NULL) {
+#if PYTHON_VERSION < 0x3c0
+        NORMALIZE_EXCEPTION_STATE(tstate, exception_state);
 #endif
-
-// Format a UnboundLocalError exception for a variable name.
-extern void FORMAT_UNBOUND_LOCAL_ERROR(PyObject **exception_type, PyObject **exception_value, PyObject *variable_name);
-
-extern void FORMAT_UNBOUND_CLOSURE_ERROR(PyObject **exception_type, PyObject **exception_value,
-                                         PyObject *variable_name);
-
+        Nuitka_Exception_SetContext(exception_state->exception_value, context);
+    }
+}
 #endif
 
-#if PYTHON_VERSION >= 0x3c0
-static PyObject *_MAKE_EXCEPTION_FROM_TYPE_ARG0(PyTypeObject *type, PyObject *arg) {
-    PyBaseExceptionObject *self;
-
-    self = (PyBaseExceptionObject *)type->tp_alloc(type, 0);
-
-    self->dict = NULL;
-    self->notes = NULL;
-    self->traceback = self->cause = self->context = NULL;
-    self->suppress_context = 0;
-
-    assert(arg != NULL);
+// Our replacement for "PyException_SetCause", consumes a reference.
+NUITKA_MAY_BE_UNUSED static inline void Nuitka_Exception_SetCause(PyObject *self, PyObject *cause) {
+    PyBaseExceptionObject *base_self = _PyBaseExceptionObject_cast(self);
+    base_self->suppress_context = 1;
+    Py_XSETREF(base_self->cause, cause);
+}
 
-    if (!PyTuple_Check(arg)) {
-        self->args = MAKE_TUPLE1(arg);
-    } else {
-        self->args = Py_NewRef(arg);
-    }
+#endif
 
-    return (PyObject *)self;
-}
 #endif
+
+//     Part of "Nuitka", an optimizing Python compiler that is compatible and
+//     integrates with CPython, but also works on its own.
+//
+//     Licensed under the Apache License, Version 2.0 (the "License");
+//     you may not use this file except in compliance with the License.
+//     You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//     Unless required by applicable law or agreed to in writing, software
+//     distributed under the License is distributed on an "AS IS" BASIS,
+//     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//     See the License for the specific language governing permissions and
+//     limitations under the License.