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

nuitka/build/static_src/CompiledGeneratorType.c

@@ -110,13 +110,15 @@ static void Nuitka_MarkGeneratorAsNotRunning(struct Nuitka_GeneratorObject *gene
 }
 
 static PyObject *Nuitka_Generator_tp_repr(struct Nuitka_GeneratorObject *generator) {
-    return Nuitka_String_FromFormat("<compiled_generator object %s at %p>",
-#if PYTHON_VERSION < 0x350
-                                    Nuitka_String_AsString(generator->m_name),
+#if PYTHON_VERSION < 0x300
+    return Nuitka_String_FromFormat("<compiled_generator object %s at %p>", Nuitka_String_AsString(generator->m_name),
+                                    generator);
+#elif PYTHON_VERSION < 0x350
+    return Nuitka_String_FromFormat("<compiled_generator object %U at %p>", generator->m_name, generator);
+
 #else
-                                    Nuitka_String_AsString(generator->m_qualname),
+    return Nuitka_String_FromFormat("<compiled_generator object %U at %p>", generator->m_qualname, generator);
 #endif
-                                    generator);
 }
 
 static long Nuitka_Generator_tp_traverse(struct Nuitka_GeneratorObject *generator, visitproc visit, void *arg) {
@@ -175,7 +177,7 @@ static PyObject *ERROR_GET_STOP_ITERATION_VALUE(PyThreadState *tstate) {
     }
 
     if (value == NULL) {
-        Py_INCREF(Py_None);
+        Py_INCREF_IMMORTAL(Py_None);
         value = Py_None;
     }
 
@@ -365,7 +367,7 @@ static PyObject *_Nuitka_YieldFromGeneratorCore(PyThreadState *tstate, struct Nu
         PyObject *error = GET_ERROR_OCCURRED(tstate);
 
         if (error == NULL) {
-            Py_INCREF(Py_None);
+            Py_INCREF_IMMORTAL(Py_None);
             generator->m_returned = Py_None;
         } else if (likely(EXCEPTION_MATCH_BOOL_SINGLE(tstate, error, PyExc_StopIteration))) {
             // The sub-generator has given an exception. In case of
@@ -456,7 +458,7 @@ static void _Nuitka_GeneratorPopFrame(PyThreadState *tstate, Nuitka_ThreadStateF
 #if PYTHON_VERSION < 0x3b0
     tstate->frame = return_frame;
 #else
-    tstate->cframe->current_frame = return_frame;
+    CURRENT_TSTATE_INTERPRETER_FRAME(tstate) = return_frame;
 #endif
 
     PRINT_TOP_FRAME("Generator pop exit gives top frame:");
@@ -481,13 +483,11 @@ static void RAISE_RUNTIME_ERROR_RAISED_STOP_ITERATION(PyThreadState *tstate, cha
                         &new_exception_state.exception_tb);
 #endif
 
-#if PYTHON_VERSION < 0x3c0
     Py_INCREF(saved_exception_state.exception_value);
     RAISE_EXCEPTION_WITH_CAUSE_STATE(tstate, &new_exception_state, saved_exception_state.exception_value);
 
     Py_INCREF(saved_exception_state.exception_value);
     PyException_SetContext(new_exception_state.exception_value, saved_exception_state.exception_value);
-#endif
 
     RELEASE_ERROR_OCCURRED_STATE_X(&saved_exception_state);
     RESTORE_ERROR_OCCURRED_STATE(tstate, &new_exception_state);
@@ -599,7 +599,9 @@ static PyObject *_Nuitka_Generator_send(PyThreadState *tstate, struct Nuitka_Gen
             // assert(tstate->frame == &generator->m_frame->m_frame);
             assertFrameObject(generator->m_frame);
 
-            Py_CLEAR(generator->m_frame->m_frame.f_back);
+            if (generator->m_frame->m_frame.f_back) {
+                Py_CLEAR(generator->m_frame->m_frame.f_back);
+            }
         }
 
         // Return back to the frame that called us.
@@ -706,9 +708,9 @@ static PyObject *_Nuitka_Generator_send(PyThreadState *tstate, struct Nuitka_Gen
                 tstate->exc_value = Py_None;
                 tstate->exc_traceback = (PyObject *)Py_None;
 
-                Py_INCREF(Py_None);
-                Py_INCREF(Py_None);
-                Py_INCREF(Py_None);
+                Py_INCREF_IMMORTAL(Py_None);
+                Py_INCREF_IMMORTAL(Py_None);
+                Py_INCREF_IMMORTAL(Py_None);
 
                 Py_XDECREF(old_type);
                 Py_XDECREF(old_value);
@@ -767,7 +769,7 @@ static PyObject *Nuitka_Generator_send(struct Nuitka_GeneratorObject *generator,
 static PyObject *Nuitka_Generator_tp_iternext(struct Nuitka_GeneratorObject *generator) {
     PyThreadState *tstate = PyThreadState_GET();
 
-    Py_INCREF(Py_None);
+    Py_INCREF_IMMORTAL(Py_None);
 
     struct Nuitka_ExceptionPreservationItem exception_state;
     INIT_ERROR_OCCURRED_STATE(&exception_state);
@@ -778,7 +780,7 @@ static PyObject *Nuitka_Generator_tp_iternext(struct Nuitka_GeneratorObject *gen
 /* Our own qiter interface, which is for quicker simple loop style iteration,
    that does not send anything in. */
 PyObject *Nuitka_Generator_qiter(PyThreadState *tstate, struct Nuitka_GeneratorObject *generator, bool *finished) {
-    Py_INCREF(Py_None);
+    Py_INCREF_IMMORTAL(Py_None);
 
     struct Nuitka_ExceptionPreservationItem exception_state;
     INIT_ERROR_OCCURRED_STATE(&exception_state);
@@ -853,7 +855,7 @@ static PyObject *Nuitka_Generator_close(struct Nuitka_GeneratorObject *generator
     if (unlikely(r == false)) {
         return NULL;
     } else {
-        Py_INCREF(Py_None);
+        Py_INCREF_IMMORTAL(Py_None);
         return Py_None;
     }
 }
@@ -1489,7 +1491,7 @@ static PyObject *Nuitka_Generator_get_yieldfrom(struct Nuitka_GeneratorObject *g
         Py_INCREF(generator->m_yield_from);
         return generator->m_yield_from;
     } else {
-        Py_INCREF(Py_None);
+        Py_INCREF_IMMORTAL(Py_None);
         return Py_None;
     }
 }
@@ -1537,7 +1539,7 @@ static PyObject *Nuitka_Generator_get_running(struct Nuitka_GeneratorObject *gen
     result = PyInt_FromLong(generator->m_running);
 #else
     result = BOOL_FROM(generator->m_running != 0);
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
 #endif
     return result;
 }