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

nuitka/code_generation/templates/CodeTemplatesConstants.py

@@ -1,22 +1,9 @@
-#     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
+
+
 """ Templates for the constants handling.
 
+spell-checker: ignore structseq
 """
 
 template_constants_reading = r"""
@@ -31,21 +18,55 @@ PyObject *global_constants[%(global_constants_count)d];
 // Sentinel PyObject to be used for all our call iterator endings. It will
 // become a PyCObject pointing to NULL. It's address is unique, and that's
 // enough for us to use it as sentinel value.
-PyObject *_sentinel_value = NULL;
+PyObject *Nuitka_sentinel_value = NULL;
 
 PyObject *Nuitka_dunder_compiled_value = NULL;
 
 
 #ifdef _NUITKA_STANDALONE
 extern PyObject *getStandaloneSysExecutablePath(PyObject *basename);
+
+NUITKA_MAY_BE_UNUSED static PyObject *STRIP_DIRNAME(PyObject *path) {
+#if PYTHON_VERSION < 0x300
+    char const *path_cstr = PyString_AS_STRING(path);
+
+#ifdef _WIN32
+    char const *last_sep = strrchr(path_cstr, '\\');
+#else
+    char const *last_sep = strrchr(path_cstr, '/');
 #endif
+    if (unlikely(last_sep == NULL)) {
+        Py_INCREF(path);
+        return path;
+    }
 
-extern void setDistributionsMetadata(PyObject *metadata_values);
+    return PyString_FromStringAndSize(path_cstr, last_sep - path_cstr);
+#else
+#ifdef _WIN32
+    Py_ssize_t dot_index = PyUnicode_Find(path, const_str_backslash, 0, PyUnicode_GetLength(path), -1);
+#else
+    Py_ssize_t dot_index = PyUnicode_Find(path, const_str_slash, 0, PyUnicode_GetLength(path), -1);
+#endif
+    if (likely(dot_index != -1)) {
+        return PyUnicode_Substring(path, 0, dot_index);
+    } else {
+        Py_INCREF(path);
+        return path;
+    }
+#endif
+}
+#endif
+
+extern void setDistributionsMetadata(PyThreadState *tstate, PyObject *metadata_items);
 
 // We provide the sys.version info shortcut as a global value here for ease of use.
 PyObject *Py_SysVersionInfo = NULL;
 
+#if defined(_NUITKA_MODULE) && PYTHON_VERSION >= 0x3c0
+static void _createGlobalConstants(PyThreadState *tstate, PyObject *real_module_name) {
+#else
 static void _createGlobalConstants(PyThreadState *tstate) {
+#endif
     // We provide the sys.version info shortcut as a global value here for ease of use.
     Py_SysVersionInfo = Nuitka_SysGetObject("version_info");
 
@@ -97,25 +118,31 @@ static void _createGlobalConstants(PyThreadState *tstate) {
 
     static PyTypeObject Nuitka_VersionInfoType;
 
-    // Same fields as "sys.version_info" except no serial number.
+    // Same fields as "sys.version_info" except no serial number
+    // spell-checker: ignore releaselevel
     static PyStructSequence_Field Nuitka_VersionInfoFields[] = {
         {(char *)"major", (char *)"Major release number"},
         {(char *)"minor", (char *)"Minor release number"},
         {(char *)"micro", (char *)"Micro release number"},
         {(char *)"releaselevel", (char *)"'alpha', 'beta', 'candidate', or 'release'"},
+        {(char *)"containing_dir", (char *)"directory of the containing binary"},
         {(char *)"standalone", (char *)"boolean indicating standalone mode usage"},
-        {(char *)"onefile", (char *)"boolean indicating standalone mode usage"},
+        {(char *)"onefile", (char *)"boolean indicating onefile mode usage"},
+        {(char *)"macos_bundle_mode", (char *)"boolean indicating macOS app bundle mode usage"},
         {(char *)"no_asserts", (char *)"boolean indicating --python-flag=no_asserts usage"},
         {(char *)"no_docstrings", (char *)"boolean indicating --python-flag=no_docstrings usage"},
         {(char *)"no_annotations", (char *)"boolean indicating --python-flag=no_annotations usage"},
+        {(char *)"module", (char *)"boolean indicating --module usage"},
+        {(char *)"main", (char *)"name of main module at runtime"},
+        {(char *)"original_argv0", (char *)"original argv[0] as received by the onefile binary, None otherwise"},
         {0}
     };
 
     static PyStructSequence_Desc Nuitka_VersionInfoDesc = {
-        (char *)"__nuitka_version__",                                    /* name */
-        (char *)"__compiled__\\n\\nVersion information as a named tuple.", /* doc */
-        Nuitka_VersionInfoFields,                                        /* fields */
-        9
+        (char *)"__nuitka_version__",                                       /* name */
+        (char *)"__compiled__\\n\\nVersion information as a named tuple.",  /* doc */
+        Nuitka_VersionInfoFields,                                           /* fields */
+        sizeof(Nuitka_VersionInfoFields) / sizeof(PyStructSequence_Field)-1 /* count */
     };
 
     PyStructSequence_InitType(&Nuitka_VersionInfoType, &Nuitka_VersionInfoDesc);
@@ -123,52 +150,104 @@ static void _createGlobalConstants(PyThreadState *tstate) {
     Nuitka_dunder_compiled_value = PyStructSequence_New(&Nuitka_VersionInfoType);
     assert(Nuitka_dunder_compiled_value != NULL);
 
-    PyStructSequence_SET_ITEM(Nuitka_dunder_compiled_value, 0, PyInt_FromLong(%(nuitka_version_major)s));
-    PyStructSequence_SET_ITEM(Nuitka_dunder_compiled_value, 1, PyInt_FromLong(%(nuitka_version_minor)s));
-    PyStructSequence_SET_ITEM(Nuitka_dunder_compiled_value, 2, PyInt_FromLong(%(nuitka_version_micro)s));
+    PyStructSequence_SET_ITEM(Nuitka_dunder_compiled_value, 0, Nuitka_PyInt_FromLong(%(nuitka_version_major)s));
+    PyStructSequence_SET_ITEM(Nuitka_dunder_compiled_value, 1, Nuitka_PyInt_FromLong(%(nuitka_version_minor)s));
+    PyStructSequence_SET_ITEM(Nuitka_dunder_compiled_value, 2, Nuitka_PyInt_FromLong(%(nuitka_version_micro)s));
 
     PyStructSequence_SET_ITEM(Nuitka_dunder_compiled_value, 3, Nuitka_String_FromString("%(nuitka_version_level)s"));
 
+    PyObject *binary_directory = getContainingDirectoryObject(false);
+#ifdef _NUITKA_STANDALONE
+#ifndef _NUITKA_ONEFILE_MODE
+    binary_directory = STRIP_DIRNAME(binary_directory);
+#endif
+
+#ifdef _NUITKA_MACOS_BUNDLE
+    binary_directory = STRIP_DIRNAME(binary_directory);
+    binary_directory = STRIP_DIRNAME(binary_directory);
+#endif
+#endif
+
+    PyStructSequence_SET_ITEM(Nuitka_dunder_compiled_value, 4, binary_directory);
+
 #ifdef _NUITKA_STANDALONE
     PyObject *is_standalone_mode = Py_True;
 #else
     PyObject *is_standalone_mode = Py_False;
 #endif
-    PyStructSequence_SET_ITEM(Nuitka_dunder_compiled_value, 4, is_standalone_mode);
+    PyStructSequence_SET_ITEM(Nuitka_dunder_compiled_value, 5, is_standalone_mode);
 #ifdef _NUITKA_ONEFILE_MODE
     PyObject *is_onefile_mode = Py_True;
 #else
     PyObject *is_onefile_mode = Py_False;
 #endif
-    PyStructSequence_SET_ITEM(Nuitka_dunder_compiled_value, 5, is_onefile_mode);
+    PyStructSequence_SET_ITEM(Nuitka_dunder_compiled_value, 6, is_onefile_mode);
+
+#ifdef _NUITKA_MACOS_BUNDLE
+    PyObject *is_macos_bundle_mode = Py_True;
+#else
+    PyObject *is_macos_bundle_mode = Py_False;
+#endif
+    PyStructSequence_SET_ITEM(Nuitka_dunder_compiled_value, 7, is_macos_bundle_mode);
 
 #if _NUITKA_NO_ASSERTS == 1
     PyObject *is_no_asserts = Py_True;
 #else
     PyObject *is_no_asserts = Py_False;
 #endif
-    PyStructSequence_SET_ITEM(Nuitka_dunder_compiled_value, 6, is_no_asserts);
+    PyStructSequence_SET_ITEM(Nuitka_dunder_compiled_value, 8, is_no_asserts);
 
 #if _NUITKA_NO_DOCSTRINGS == 1
     PyObject *is_no_docstrings = Py_True;
 #else
     PyObject *is_no_docstrings = Py_False;
 #endif
-    PyStructSequence_SET_ITEM(Nuitka_dunder_compiled_value, 7, is_no_docstrings);
-
+    PyStructSequence_SET_ITEM(Nuitka_dunder_compiled_value, 9, is_no_docstrings);
 
 #if _NUITKA_NO_ANNOTATIONS == 1
     PyObject *is_no_annotations = Py_True;
 #else
     PyObject *is_no_annotations = Py_False;
 #endif
-    PyStructSequence_SET_ITEM(Nuitka_dunder_compiled_value, 8, is_no_annotations);
+    PyStructSequence_SET_ITEM(Nuitka_dunder_compiled_value, 10, is_no_annotations);
+
+#ifdef _NUITKA_MODULE
+    PyObject *is_module_mode = Py_True;
+#else
+    PyObject *is_module_mode = Py_False;
+#endif
+    PyStructSequence_SET_ITEM(Nuitka_dunder_compiled_value, 11, is_module_mode);
+
+#ifdef _NUITKA_MODULE
+    PyObject *main_name;
+
+#if PYTHON_VERSION < 0x3c0
+    if (_Py_PackageContext != NULL) {
+        main_name = Nuitka_String_FromString(_Py_PackageContext);
+    } else {
+        main_name = Nuitka_String_FromString(%(module_name_cstr)s);
+    }
+#else
+    main_name = real_module_name;
+#endif
+#else
+    PyObject *main_name = Nuitka_String_FromString("__main__");
+#endif
+    PyStructSequence_SET_ITEM(Nuitka_dunder_compiled_value, 12, main_name);
+
+#if defined(_NUITKA_EXE)
+    PyObject *original_argv0 = getOriginalArgv0Object();
+#else
+    PyObject *original_argv0 = Py_None;
+# endif
+    PyStructSequence_SET_ITEM(Nuitka_dunder_compiled_value, 13, original_argv0);
 
     // Prevent users from creating the Nuitka version type object.
     Nuitka_VersionInfoType.tp_init = NULL;
     Nuitka_VersionInfoType.tp_new = NULL;
 
-    setDistributionsMetadata(%(metadata_values)s);
+    // Register included meta data.
+    setDistributionsMetadata(tstate, %(metadata_values)s);
 }
 
 // In debug mode we can check that the constants were not tampered with in any
@@ -181,17 +260,27 @@ void checkGlobalConstants(void) {
 }
 #endif
 
+#if defined(_NUITKA_MODULE) && PYTHON_VERSION >= 0x3c0
+void createGlobalConstants(PyThreadState *tstate, PyObject *real_module_name) {
+#else
 void createGlobalConstants(PyThreadState *tstate) {
-    if (_sentinel_value == NULL) {
+#endif
+    if (Nuitka_sentinel_value == NULL) {
 #if PYTHON_VERSION < 0x300
-        _sentinel_value = PyCObject_FromVoidPtr(NULL, NULL);
+        Nuitka_sentinel_value = PyCObject_FromVoidPtr(NULL, NULL);
 #else
         // The NULL value is not allowed for a capsule, so use something else.
-        _sentinel_value = PyCapsule_New((void *)27, "sentinel", NULL);
+        Nuitka_sentinel_value = PyCapsule_New((void *)27, "sentinel", NULL);
 #endif
-        assert(_sentinel_value);
+        assert(Nuitka_sentinel_value);
+
+        Py_SET_REFCNT_IMMORTAL(Nuitka_sentinel_value);
 
+#if defined(_NUITKA_MODULE) && PYTHON_VERSION >= 0x3c0
+        _createGlobalConstants(tstate, real_module_name);
+#else
         _createGlobalConstants(tstate);
+#endif
     }
 }
 """
@@ -199,3 +288,18 @@ void createGlobalConstants(PyThreadState *tstate) {
 from . import TemplateDebugWrapper  # isort:skip
 
 TemplateDebugWrapper.checkDebug(globals())
+
+#     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.

nuitka/code_generation/templates/CodeTemplatesCoroutines.py

@@ -1,20 +1,6 @@
-#     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
+
+
 """ Coroutines function (await/async) related templates.
 
 """
@@ -82,8 +68,8 @@ template_coroutine_exception_exit = """\
 
     function_exception_exit:
 %(function_cleanup)s
-    assert(%(exception_type)s);
-    RESTORE_ERROR_OCCURRED(tstate, %(exception_type)s, %(exception_value)s, %(exception_tb)s);
+    CHECK_EXCEPTION_STATE(&%(exception_state_name)s);
+    RESTORE_ERROR_OCCURRED_STATE(tstate, &%(exception_state_name)s);
     return NULL;
 """
 
@@ -106,3 +92,18 @@ template_coroutine_return_exit = """\
 from . import TemplateDebugWrapper  # isort:skip
 
 TemplateDebugWrapper.checkDebug(globals())
+
+#     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.

nuitka/code_generation/templates/CodeTemplatesExceptions.py

@@ -1,46 +1,31 @@
-#     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
+
+
 """ Templates for handling exceptions.
 
 """
 
 template_publish_exception_to_handler = """\
-if (%(keeper_tb)s == NULL) {
-    %(keeper_tb)s = %(tb_making)s;
-} else if (%(keeper_lineno)s != 0) {
-    %(keeper_tb)s = ADD_TRACEBACK(%(keeper_tb)s, %(frame_identifier)s, %(keeper_lineno)s);
+{
+    PyTracebackObject *exception_tb = GET_EXCEPTION_STATE_TRACEBACK(&%(keeper_exception_state_name)s);
+    if (exception_tb == NULL) {
+        exception_tb = %(tb_making)s;
+        SET_EXCEPTION_STATE_TRACEBACK(&%(keeper_exception_state_name)s, exception_tb);
+    } else if (%(keeper_lineno)s != 0) {
+        exception_tb = ADD_TRACEBACK(exception_tb, %(frame_identifier)s, %(keeper_lineno)s);
+        SET_EXCEPTION_STATE_TRACEBACK(&%(keeper_exception_state_name)s, exception_tb);
+    }
 }
 """
 
-template_error_catch_quick_exception = """\
+template_error_catch_fetched_exception = """\
 if (%(condition)s) {
-    if (!HAS_ERROR_OCCURRED(tstate)) {
-        %(exception_type)s = %(quick_exception)s;
-        Py_INCREF(%(exception_type)s);
-        %(exception_value)s = NULL;
-        %(exception_tb)s = NULL;
-    } else {
-        FETCH_ERROR_OCCURRED(tstate, &%(exception_type)s, &%(exception_value)s, &%(exception_tb)s);
-    }
+    assert(HAS_EXCEPTION_STATE(&%(exception_state_name)s));
+
 %(release_temps)s
 
-%(var_description_code)s
 %(line_number_code)s
+%(var_description_code)s
     goto %(exception_exit)s;
 }"""
 
@@ -48,7 +33,7 @@ template_error_catch_exception = """\
 if (%(condition)s) {
     assert(HAS_ERROR_OCCURRED(tstate));
 
-    FETCH_ERROR_OCCURRED(tstate, &%(exception_type)s, &%(exception_value)s, &%(exception_tb)s);
+    FETCH_ERROR_OCCURRED_STATE(tstate, &%(exception_state_name)s);
 %(release_temps)s
 
 %(line_number_code)s
@@ -70,7 +55,7 @@ if (%(condition)s) {
 template_error_format_name_error_exception = """\
 if (unlikely(%(condition)s)) {
 %(release_temps)s
-%(set_exception)s
+%(raise_name_error_helper)s(tstate, &%(exception_state_name)s, %(variable_name)s);
 
 %(line_number_code)s
 %(var_description_code)s
@@ -82,3 +67,18 @@ if (unlikely(%(condition)s)) {
 from . import TemplateDebugWrapper  # isort:skip
 
 TemplateDebugWrapper.checkDebug(globals())
+
+#     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.

nuitka/code_generation/templates/CodeTemplatesFrames.py

@@ -1,20 +1,6 @@
-#     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
+
+
 """ Code templates for frames of all kinds.
 
 """
@@ -56,7 +42,7 @@ Py_INCREF({{context_identifier}}->m_frame);
 assert(Py_REFCNT({{context_identifier}}->m_frame) == 2); // Frame stack
 {% endif %}
 
-{% if is_python34_or_later %}
+{% if is_python3 %}
 Nuitka_SetFrameGenerator({{context_identifier}}->m_frame, (PyObject *){{context_identifier}});
 {% endif %}
 
@@ -131,10 +117,15 @@ template_frame_guard_normal_exception_handler = """\
 RESTORE_FRAME_EXCEPTION(tstate, {{frame_identifier}});
 {% endif %}
 
-if ({{exception_tb}} == NULL) {
-    {{exception_tb}} = {{tb_making_code}};
-} else if ({{exception_tb}}->tb_frame != &{{frame_identifier}}->m_frame) {
-    {{exception_tb}} = ADD_TRACEBACK({{exception_tb}}, {{frame_identifier}}, {{exception_lineno}});
+{
+    PyTracebackObject *exception_tb = GET_EXCEPTION_STATE_TRACEBACK(&{{exception_state_name}});
+    if (exception_tb == NULL) {
+        exception_tb = {{tb_making_code}};
+        SET_EXCEPTION_STATE_TRACEBACK(&{{exception_state_name}}, exception_tb);
+    } else if (exception_tb->tb_frame != &{{frame_identifier}}->m_frame) {
+        exception_tb = ADD_TRACEBACK(exception_tb, {{frame_identifier}}, {{exception_lineno}});
+        SET_EXCEPTION_STATE_TRACEBACK(&{{exception_state_name}}, exception_tb);
+    }
 }
 
 {% if attach_locals_code %}
@@ -188,11 +179,14 @@ template_frame_guard_generator_exception_handler = """\
 %(frame_exception_exit)s:;
 
 // If it's not an exit exception, consider and create a traceback for it.
-if (!EXCEPTION_MATCH_GENERATOR(tstate, %(exception_type)s)) {
-    if (%(exception_tb)s == NULL) {
-        %(exception_tb)s = %(tb_making)s;
-    } else if (%(exception_tb)s->tb_frame != &%(frame_identifier)s->m_frame) {
-        %(exception_tb)s = ADD_TRACEBACK(%(exception_tb)s, %(frame_identifier)s, %(exception_lineno)s);
+if (!EXCEPTION_STATE_MATCH_GENERATOR(tstate, &%(exception_state_name)s)) {
+    PyTracebackObject *exception_tb = GET_EXCEPTION_STATE_TRACEBACK(&%(exception_state_name)s);
+    if (exception_tb == NULL) {
+        exception_tb = %(tb_making)s;
+        SET_EXCEPTION_STATE_TRACEBACK(&%(exception_state_name)s, exception_tb);
+    } else if ((%(exception_lineno)s != 0) && (exception_tb->tb_frame != &%(frame_identifier)s->m_frame)) {
+        exception_tb = ADD_TRACEBACK(exception_tb, %(frame_identifier)s, %(exception_lineno)s);
+        SET_EXCEPTION_STATE_TRACEBACK(&%(exception_state_name)s, exception_tb);
     }
 
 %(attach_locals)s
@@ -228,3 +222,18 @@ goto %(parent_exception_exit)s;
 from . import TemplateDebugWrapper  # isort:skip
 
 TemplateDebugWrapper.checkDebug(globals())
+
+#     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.

nuitka/code_generation/templates/CodeTemplatesFunction.py

@@ -1,20 +1,6 @@
-#     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
+
+
 """ Normal function (no generator, not yielding) related templates.
 
 """
@@ -77,8 +63,8 @@ static PyObject *impl_%(function_identifier)s(PyThreadState *tstate, %(parameter
 template_function_exception_exit = """\
 function_exception_exit:
 %(function_cleanup)s
-    assert(%(exception_type)s);
-    RESTORE_ERROR_OCCURRED(tstate, %(exception_type)s, %(exception_value)s, %(exception_tb)s);
+    CHECK_EXCEPTION_STATE(&%(exception_state_name)s);
+    RESTORE_ERROR_OCCURRED_STATE(tstate, &%(exception_state_name)s);
 
     return NULL;
 """
@@ -114,3 +100,18 @@ function_direct_body_template = """\
 from . import TemplateDebugWrapper  # isort:skip
 
 TemplateDebugWrapper.checkDebug(globals())
+
+#     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.

nuitka/code_generation/templates/CodeTemplatesGeneratorFunction.py

@@ -1,20 +1,6 @@
-#     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
+
+
 """ Generator function (with yield) related templates.
 
 """
@@ -98,8 +84,8 @@ template_generator_exception_exit = """\
 
     function_exception_exit:
 %(function_cleanup)s
-    assert(%(exception_type)s);
-    RESTORE_ERROR_OCCURRED(tstate, %(exception_type)s, %(exception_value)s, %(exception_tb)s);
+    CHECK_EXCEPTION_STATE(&%(exception_state_name)s);
+    RESTORE_ERROR_OCCURRED_STATE(tstate, &%(exception_state_name)s);
 
     return NULL;
 """
@@ -119,6 +105,7 @@ template_generator_return_exit = """\
     generator->m_returned = %(return_value)s;
 #endif
 
+%(function_cleanup)s
     return NULL;
 """
 
@@ -126,3 +113,18 @@ template_generator_return_exit = """\
 from . import TemplateDebugWrapper  # isort:skip
 
 TemplateDebugWrapper.checkDebug(globals())
+
+#     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.