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

nuitka/code_generation/templates_c/HelperOperationComparisonDual.c.j2

@@ -0,0 +1,86 @@
+{#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file #}
+
+{% macro compare_call(op_code, target, left, right, left_choice, right_choice, operand1, operand2) %}
+{% if left.getDualType(left_choice) == c_long_desc and right.getDualType(right_choice) == c_digit_desc %}
+{% set right = c_long_desc %}
+{% endif %}
+{% if left.getDualType(left_choice) == c_digit_desc and right.getDualType(right_choice) == c_long_desc %}
+{% set left = c_long_desc %}
+{% endif %}
+COMPARE_{{op_code}}_{{target.getHelperCodeName()}}_{{left.getDualType(left_choice).getHelperCodeName()}}_{{right.getDualType(right_choice).getHelperCodeName()}}({{left.getDualTypeAccessCode(left_choice, "operand1")}}, {{right.getDualTypeAccessCode(right_choice, "operand2")}})
+{% endmacro %}
+{{ target.getTypeDecl() }} RICH_COMPARE_{{op_code}}_{{target.getHelperCodeName()}}_{{left.getHelperCodeName()}}_{{right.getHelperCodeName()}}({{left.getVariableDecl("operand1")}}, {{right.getVariableDecl("operand2")}}) {
+    {{ left.getCheckValueCode("operand1") }}
+    {{ right.getCheckValueCode("operand2") }}
+
+    bool left_c_usable = {{left.getDualValidityCheckCode("C", "operand1")}};
+    bool right_c_usable = {{right.getDualValidityCheckCode("C", "operand2")}};
+
+    if (left_c_usable && right_c_usable) {
+{% if left.isSimilarOrSameTypesAsOneOf(n_ilong_desc) or right.isSimilarOrSameTypesAsOneOf(n_ilong_desc) %}
+{% if op_code in ("LT", "LE", "EQ") %}
+        return {{ compare_call(op_code, target, left, right, "C", "C", "operand1", "operand2") }};
+{% else %}
+        bool r = {{ compare_call(inverse_compare_op_code, c_bool_desc, left, right, "C", "C", "operand1", "operand2") }};
+
+        // Convert to target type.
+        {{ target.getTypeDecl() }} result = {{target.getToValueFromBoolExpression("!r")}};
+        {{ target.getTakeReferenceStatement("result", immortal=True) }}
+        return result;
+{% endif %}
+{% else %}
+        {{ 0/0 }}
+{% endif %}
+    } else if (!left_c_usable && !right_c_usable) {
+{% if left.isDualType() and right.isDualType() %}
+        return RICH_{{ compare_call(op_code, target, left, right, "Python", "Python", "operand1", "operand2") }};
+{% elif left.isDualType()  %}
+        {{left.getDualTypeEnsurePythonObjectCode("operand1")}}
+
+        return COMPARE_{{op_code}}_{{target.getHelperCodeName()}}_{{left.getDualType("Python").getHelperCodeName()}}_{{right.getHelperCodeName()}}({{left.getDualTypeAccessCode("Python", "operand1")}}, {{right.getDualTypeAccessCode("C", "operand2")}});
+{% elif right.isDualType()  %}
+        {{right.getDualTypeEnsurePythonObjectCode("operand1")}}
+
+        return RICH_COMPARE_{{op_code}}_{{target.getHelperCodeName()}}_{{left.getHelperCodeName()}}_{{right.getDualType("Python").getHelperCodeName()}}({{right.getDualTypeAccessCode("C", "operand1")}}, {{right.getDualTypeAccessCode("Python", "operand2")}});
+{% else %}
+        {{ 0/0 }}
+{% endif %}
+    } else {
+{% if left.isDualType() and right.isDualType() %}
+        bool r;
+        if (left_c_usable) {
+            r = COMPARE_{{reversed_args_op_code}}_CBOOL_{{right.getDualType("Python").getHelperCodeName()}}_{{left.getDualType("C").getHelperCodeName()}}({{right.getDualTypeAccessCode("Python", "operand2")}}, {{left.getDualTypeAccessCode("C", "operand1")}});
+            r = !r;
+        } else {
+           r = COMPARE_{{op_code}}_CBOOL_{{left.getDualType("Python").getHelperCodeName()}}_{{right.getDualType("C").getHelperCodeName()}}({{left.getDualTypeAccessCode("Python", "operand1")}}, {{left.getDualTypeAccessCode("C", "operand2")}});
+        }
+
+        // Convert to target type.
+        {{ target.getTypeDecl() }} result = {{target.getToValueFromBoolExpression("r")}};
+        {{ target.getTakeReferenceStatement("result", immortal=True) }}
+        return result;
+{% elif left.isDualType() %}
+        return {{ compare_call(op_code, target, left, right, "Python", "C", "operand1", "operand2") }};
+{% elif right.isDualType() %}
+        return {{ compare_call(reversed_args_op_code, target, right, left, "Python", "C", "operand2", "operand1") }};
+{% else %}
+        {{ 0/0 }}
+{% 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.                                           #}

nuitka/code_generation/templates_c/HelperOperationComparisonFloat.c.j2

@@ -7,7 +7,7 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
     const double a = {{ left.getAsDoubleValueExpression("operand1") }};
     const double b = {{ right.getAsDoubleValueExpression("operand2") }};
 
-    bool r = a {{operand}} b;
+    bool r = a {{operator}} b;
 
     // Convert to target type.
     {{ target.getTypeDecl() }} result = {{target.getToValueFromBoolExpression("r")}};

nuitka/code_generation/templates_c/HelperOperationComparisonInt.c.j2

@@ -8,7 +8,7 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
     const long a = {{left.getAsLongValueExpression("operand1")}};
     const long b = {{right.getAsLongValueExpression("operand2")}};
 
-    bool r = a {{operand}} b;
+    bool r = a {{operator}} b;
 
     // Convert to target type.
     {{ target.getTypeDecl() }} result = {{target.getToValueFromBoolExpression("r")}};

nuitka/code_generation/templates_c/HelperOperationComparisonList.c.j2

@@ -9,9 +9,9 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
     PyListObject *b = (PyListObject *)operand2;
 
 {# Shortcut for equality, driven by length check. #}
-{% if operand in ("==", "!=") %}
+{% if operator in ("==", "!=") %}
     if (Py_SIZE(a) != Py_SIZE(b)) {
-{% if operand == "==" %}
+{% if operator == "==" %}
         bool r = false;
 {% else %}
         bool r = true;
@@ -25,7 +25,7 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
 {% endif %}
 
 {# Find the first non-identical object. #}
-{% if operand not in ("==", "!=") %}
+{% if operator not in ("==", "!=") %}
     bool found = false;
 {% endif %}
     nuitka_bool res = NUITKA_BOOL_TRUE;
@@ -50,7 +50,7 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
         }
 
         if (res == NUITKA_BOOL_FALSE) {
-{% if operand not in ("==", "!=") %}
+{% if operator not in ("==", "!=") %}
             found = true;
 {% endif %}
             break;
@@ -58,9 +58,9 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
     }
 
 {# If size mismatches, but all is equal at the start, compare sizes to order lists. #}
-{% if operand not in ("==", "!=") %}
+{% if operator not in ("==", "!=") %}
     if (found == false) {
-        bool r = Py_SIZE(a) {{operand}} Py_SIZE(b);
+        bool r = Py_SIZE(a) {{operator}} Py_SIZE(b);
 
         // Convert to target type.
         {{ target.getTypeDecl() }} result = {{target.getToValueFromBoolExpression("r")}};
@@ -70,10 +70,10 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
 
     return RICH_COMPARE_{{op_code}}_{{target.getHelperCodeName()}}_OBJECT_OBJECT(a->ob_item[i], b->ob_item[i]);
 {% else %}
-{% if operand == "==" %}
+{% if operator == "==" %}
     bool r;
     if (i >= Py_SIZE(a) || i >= Py_SIZE(b)) {
-        r = Py_SIZE(a) {{operand}} Py_SIZE(b);
+        r = Py_SIZE(a) {{operator}} Py_SIZE(b);
     } else {
         r = res == NUITKA_BOOL_TRUE;
     }
@@ -81,7 +81,7 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
     bool r;
 
     if (i >= Py_SIZE(a) || i >= Py_SIZE(b)) {
-        r = Py_SIZE(a) {{operand}} Py_SIZE(b);
+        r = Py_SIZE(a) {{operator}} Py_SIZE(b);
     } else {
         r = res == NUITKA_BOOL_FALSE;
     }

nuitka/code_generation/templates_c/HelperOperationComparisonLong.c.j2

@@ -10,7 +10,7 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
 
     bool r;
 
-{% if operand == "==" %}
+{% if operator == "==" %}
 {% if left == right == long_desc %}
     if (operand1_long_object == operand2_long_object) {
         r = true;
@@ -29,7 +29,7 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
             }
         }
     }
-{% elif operand == "!=" %}
+{% elif operator == "!=" %}
 {% if left == right == long_desc %}
     if (operand1_long_object == operand2_long_object) {
         r = false;
@@ -47,7 +47,7 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
             }
         }
     }
-{% elif operand == "<=" %}
+{% elif operator == "<=" %}
 {% if left == right == long_desc %}
     if (operand1_long_object == operand2_long_object) {
         r = true;
@@ -68,7 +68,7 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
             }
         }
     }
-{% elif operand == ">=" %}
+{% elif operator == ">=" %}
 {% if left == right == long_desc %}
     if (operand1_long_object == operand2_long_object) {
         r = true;
@@ -89,7 +89,7 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
             }
         }
     }
-{% elif operand == "<" %}
+{% elif operator == "<" %}
 {% if left == right == long_desc %}
     if (operand1_long_object == operand2_long_object) {
         r = false;
@@ -110,7 +110,7 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
             }
         }
     }
-{% elif operand == ">" %}
+{% elif operator == ">" %}
 {% if left == right == long_desc %}
     if (operand1_long_object == operand2_long_object) {
         r = false;
@@ -132,7 +132,7 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
         }
     }
 {% else %}
-# error unknown operand {{operand}}
+# error unknown operator {{operator}}
 {% endif %}
 
     // Convert to target type.

nuitka/code_generation/templates_c/HelperOperationComparisonStr.c.j2

@@ -9,7 +9,7 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
 
     // Same object has fast path for all operations.
     if (operand1 == operand2) {
-{% if operand in ("==", ">=", "<=") %}
+{% if operator in ("==", ">=", "<=") %}
         bool r = true;
 {% else %}
         bool r = false;
@@ -24,10 +24,10 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
     Py_ssize_t len_a = Py_SIZE(operand1);
     Py_ssize_t len_b = Py_SIZE(operand2);
 
-{% if operand in ("==", "!=") %}
+{% if operator in ("==", "!=") %}
     if (len_a != len_b) {
         {# Shortcut for equality/inequality, driven by length divergence. #}
-{% if operand == "==" %}
+{% if operator == "==" %}
         bool r = false;
 {% else %}
         bool r = true;
@@ -39,7 +39,7 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
         return result;
     } else {
         if ((a->ob_sval[0] == b->ob_sval[0]) && (memcmp(a->ob_sval, b->ob_sval, len_a) == 0)) {
-{% if operand == "==" %}
+{% if operator == "==" %}
             bool r = true;
 {% else %}
             bool r = false;
@@ -50,7 +50,7 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
             {{ target.getTakeReferenceStatement("result", immortal=True) }}
             return result;
         } else {
-{% if operand == "==" %}
+{% if operator == "==" %}
             bool r = false;
 {% else %}
             bool r = true;
@@ -81,13 +81,13 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
         c = (len_a < len_b) ? -1 : (len_a > len_b) ? 1 : 0;
     }
 
-{% if operand == "<" %}
+{% if operator == "<" %}
     c = c < 0;
-{% elif operand == "<=" %}
+{% elif operator == "<=" %}
     c = c <= 0;
-{% elif operand == ">" %}
+{% elif operator == ">" %}
     c = c > 0;
-{% elif operand == ">=" %}
+{% elif operator == ">=" %}
     c = c >= 0;
 {% endif %}
 

nuitka/code_generation/templates_c/HelperOperationComparisonTuple.c.j2

@@ -11,9 +11,9 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
     Py_ssize_t len_b = Py_SIZE(b);
 
 {# Shortcut for equality, driven by length check. #}
-{% if operand in ("==", "!=") %}
+{% if operator in ("==", "!=") %}
     if (len_a != len_b) {
-{% if operand == "==" %}
+{% if operator == "==" %}
         bool r = false;
 {% else %}
         bool r = true;
@@ -27,7 +27,7 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
 {% endif %}
 
 {# Find the first non-identical object. #}
-{% if operand not in ("==", "!=") %}
+{% if operator not in ("==", "!=") %}
     bool found = false;
 {% endif %}
     nuitka_bool res = NUITKA_BOOL_TRUE;
@@ -48,7 +48,7 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
         }
 
         if (res == NUITKA_BOOL_FALSE) {
-{% if operand not in ("==", "!=") %}
+{% if operator not in ("==", "!=") %}
             found = true;
 {% endif %}
             break;
@@ -56,9 +56,9 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
     }
 
 {# If size mismatches, but all is equal at the start, compare sizes to order tuples. #}
-{% if operand not in ("==", "!=") %}
+{% if operator not in ("==", "!=") %}
     if (found == false) {
-        bool r = len_a {{operand}} len_b;
+        bool r = len_a {{operator}} len_b;
 
         // Convert to target type.
         {{ target.getTypeDecl() }} result = {{target.getToValueFromBoolExpression("r")}};
@@ -68,7 +68,7 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
 
     return RICH_COMPARE_{{op_code}}_{{target.getHelperCodeName()}}_OBJECT_OBJECT(a->ob_item[i], b->ob_item[i]);
 {% else %}
-{% if operand == "==" %}
+{% if operator == "==" %}
     bool r = res == NUITKA_BOOL_TRUE;
 {% else %}
     bool r = res == NUITKA_BOOL_FALSE;

nuitka/code_generation/templates_c/HelperOperationComparisonUnicode.c.j2

@@ -9,7 +9,7 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
 
     // Same object has fast path for all operations.
     if (operand1 == operand2) {
-{% if operand in ("==", ">=", "<=") %}
+{% if operator in ("==", ">=", "<=") %}
         bool r = true;
 {% else %}
         bool r = false;
@@ -21,7 +21,7 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
         return result;
     }
 
-{% if operand in ("==", "!=") %}
+{% if operator in ("==", "!=") %}
 #if PYTHON_VERSION >= 0x300
     bool r;
 
@@ -60,7 +60,7 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
         }
     }
 
-    {{ target.getTypeDecl() }} result = {{target.getToValueFromBoolExpression("r == " + ("true" if operand == "==" else "false"))}};
+    {{ target.getTypeDecl() }} result = {{target.getToValueFromBoolExpression("r == " + ("true" if operator == "==" else "false"))}};
     {{ target.getTakeReferenceStatement("result", immortal=True) }}
     return result;
 #else
@@ -77,7 +77,7 @@ static {{ target.getTypeDecl() }} COMPARE_{{op_code}}_{{target.getHelperCodeName
         r = (cmp == 0);
     }
 
-    {{ target.getTypeDecl() }} result = {{target.getToValueFromBoolExpression("r == " + ("true" if operand == "==" else "false"))}};
+    {{ target.getTypeDecl() }} result = {{target.getToValueFromBoolExpression("r == " + ("true" if operator == "==" else "false"))}};
     {{ target.getTakeReferenceStatement("result", immortal=True) }}
     return result;
 #endif

nuitka/code_generation/templates_c/HelperSlotsBinary.c.j2

@@ -381,7 +381,7 @@
 {% endif %}
 {% endmacro %}
 {% macro call_binary_slot(props, operator, nb_slot, nb_inplace_slot, left, right, result, operand1, operand2, exit_result_ok, exit_result_exception) %}
-{% if left.isSimilarOrSameTypesAsOneOf(int_desc) or right.isSimilarOrSameTypesAsOneOf(int_desc) %}
+{% if (left.isSimilarOrSameTypesAsOneOf(int_desc) or right.isSimilarOrSameTypesAsOneOf(int_desc)) and left != long_desc and right != long_desc %}
     {{ int_slot(props, operator, nb_slot, target, left, right, result, operand1, operand2, exit_result_ok, exit_result_exception) }}
 {% elif left.isSimilarOrSameTypesAsOneOf(long_desc) or right.isSimilarOrSameTypesAsOneOf(long_desc) %}
     {{ long_slot(props, operator, nb_slot, target, left, right, result, operand1, operand2, exit_result_ok, exit_result_exception) }}

nuitka/code_generation/templates_c/HelperSlotsInt.c.j2

@@ -3,7 +3,7 @@
 {% from 'HelperSlotsCommon.c.j2' import goto_exit, constant_int_exit_target, constant_float_exit_target %}
 
 {% macro int_core(props, operator, nb_slot, bool_mode, left, right, result, operand1, operand2, exit_result_ok, exit_result_exception, exit_result_ok_cbool, exit_result_ok_clong, exit_result_ok_cfloat, exit_result_object, exit_result_ok_left, exit_result_ok_const_int_0, exit_result_ok_const_int_neg_1, exit_result_ok_const_float_0_0, exit_result_ok_const_float_minus_0_0) %}
-    {% set fall_through_needed = 1 %}
+    {% do props.update(fall_through_needed = 1) %}
 
     {{ left.getCheckValueCode(operand1) }}
     {{ right.getCheckValueCode(operand2) }}
@@ -19,7 +19,7 @@
     bool t = !no_overflow || x != 0;
 
     {{ goto_exit(props, exit_result_ok_cbool, "t") }}
-    {% set fall_through_needed = 0 %}
+    {% do props.update(fall_through_needed = 0) %}
 {% else %}
     if (likely(no_overflow)) {
         {{ goto_exit(props, exit_result_ok_clong, "x") }}
@@ -76,7 +76,7 @@
 
 {% if bool_mode %}
     {{ goto_exit(props, exit_result_ok_cbool, "a == 0") }}
-    {% set fall_through_needed = 0 %}
+    {% do props.update(fall_through_needed = 0) %}
 {% else %}
     if (a == 0) {
         if (b < 0) {
@@ -120,7 +120,7 @@
     const long r = a {{operator}} b;
 
     {{ goto_exit(props, exit_result_ok_clong, "r") }}
-    {% set fall_through_needed = 0 %}
+    {% do props.update(fall_through_needed = 0) %}
 {% elif operator == "<<" %}
     if (unlikely(b < 0)) {
         PyThreadState *tstate = PyThreadState_GET();
@@ -132,8 +132,8 @@
     if (a == 0 || b == 0) {
         {{ goto_exit(props, exit_result_ok_left) }}
     } else if (b >= LONG_BIT) {
-        PyObject *operand1_long = PyLong_FromLong(a);
-        PyObject *operand2_long = PyLong_FromLong(b);
+        PyObject *operand1_long = Nuitka_PyLong_FromLong(a);
+        PyObject *operand2_long = Nuitka_PyLong_FromLong(b);
 
         // TODO: Change this to using CLONG once we specialize that too.
         PyObject *r = _BINARY_OPERATION_LSHIFT_OBJECT_LONG_LONG(operand1_long, operand2_long);
@@ -146,8 +146,8 @@
         long c = a << b;
 
         if (a != Py_ARITHMETIC_RIGHT_SHIFT(long, c, b)) {
-            PyObject *operand1_long = PyLong_FromLong(a);
-            PyObject *operand2_long = PyLong_FromLong(b);
+            PyObject *operand1_long = Nuitka_PyLong_FromLong(a);
+            PyObject *operand2_long = Nuitka_PyLong_FromLong(b);
 
             // TODO: Change this to using CLONG once we specialize that too.
             PyObject *r = _BINARY_OPERATION_LSHIFT_OBJECT_LONG_LONG(operand1_long, operand2_long);
@@ -160,7 +160,7 @@
             {{ goto_exit(props, exit_result_ok_clong, "c") }}
         }
     }
-    {% set fall_through_needed = 0 %}
+    {% do props.update(fall_through_needed = 0) %}
 {% elif operator == ">>" %}
     if (unlikely(b < 0)) {
         PyThreadState *tstate = PyThreadState_GET();
@@ -183,7 +183,7 @@
 
         {{ goto_exit(props, exit_result_ok_clong, "r") }}
     }
-    {% set fall_through_needed = 0 %}
+    {% do props.update(fall_through_needed = 0) %}
 {% elif operator == "**" %}
     if (b < 0) {
         // TODO: Use CFLOAT once available.
@@ -209,8 +209,8 @@
                     break;
                 }
                 if (ix / temp != prev) {
-                    PyObject *operand1_long = PyLong_FromLong(a);
-                    PyObject *operand2_long = PyLong_FromLong(b);
+                    PyObject *operand1_long = Nuitka_PyLong_FromLong(a);
+                    PyObject *operand2_long = Nuitka_PyLong_FromLong(b);
 
                     PyObject *r = _BINARY_OPERATION_POW_OBJECT_LONG_LONG(operand1_long, operand2_long);
 
@@ -228,8 +228,8 @@
             temp = (unsigned long)temp * temp;
 
             if (prev != 0 && temp / prev != prev) {
-                PyObject *operand1_long = PyLong_FromLong(a);
-                PyObject *operand2_long = PyLong_FromLong(b);
+                PyObject *operand1_long = Nuitka_PyLong_FromLong(a);
+                PyObject *operand2_long = Nuitka_PyLong_FromLong(b);
 
                 PyObject *r = _BINARY_OPERATION_POW_OBJECT_LONG_LONG(operand1_long, operand2_long);
 
@@ -242,7 +242,7 @@
 
         {{ goto_exit(props, exit_result_ok_clong, "ix") }}
     }
-    {% set fall_through_needed = 0 %}
+    {% do props.update(fall_through_needed = 0) %}
 {% elif operator == "divmod" %}
     if (unlikely(b == 0)) {
         PyThreadState *tstate = PyThreadState_GET();
@@ -266,20 +266,6 @@
 {% else %}
 #error Operator {{operator}} not implemented
 {% endif %}
-{% if fall_through_needed %}
-    {
-        PyObject *operand1_object = {{ left.getAsObjectValueExpression(operand1) }};
-        PyObject *operand2_object = {{ right.getAsObjectValueExpression(operand2) }};
-
-        PyObject *r = {{ left.getSlotCallExpression(nb_slot, "PyLong_Type.tp_as_number->"+nb_slot, "operand1_object", "operand2_object") }};
-        assert(r != Py_NotImplemented);
-
-        {{ left.releaseAsObjectValueStatement("operand1_object") }}
-        {{ right.releaseAsObjectValueStatement("operand2_object") }}
-
-        {{ goto_exit(props, exit_result_object, "r") }}
-    }
-{% endif %}
 {% endmacro %}
 
 {% macro int_slot(props, operator, nb_slot, target, left, right, result, operand1, operand2, exit_result_ok, exit_result_exception) %}
@@ -299,6 +285,20 @@
 #endif
 
     {{ int_core(props, operator, nb_slot, bool_mode, left, right, result, operand1, operand2, exit_result_ok, exit_result_exception, "exit_result_ok_cbool", "exit_result_ok_clong", "exit_result_ok_cfloat", "exit_result_object", "exit_result_ok_left", "exit_result_ok_const_int_0", "exit_result_ok_const_int_neg_1", "exit_result_ok_const_float_0_0", "exit_result_ok_const_float_minus_0_0") }}
+{% if props["fall_through_needed"] %}
+    {
+        PyObject *operand1_object = {{ left.getAsObjectValueExpression(operand1) }};
+        PyObject *operand2_object = {{ right.getAsObjectValueExpression(operand2) }};
+
+        PyObject *r = {{ left.getSlotCallExpression(nb_slot, "PyLong_Type.tp_as_number->"+nb_slot, "operand1_object", "operand2_object") }};
+        assert(r != Py_NotImplemented);
+
+        {{ left.releaseAsObjectValueStatement("operand1_object") }}
+        {{ right.releaseAsObjectValueStatement("operand2_object") }}
+
+        {{ goto_exit(props, "exit_result_object", "r") }}
+    }
+{% endif %}
 
 {# // {{ props }} #}
 
@@ -314,7 +314,7 @@ exit_result_ok_cbool:
 
     // That's our return value then. As we use a dedicated variable, it's
     // OK that way.
-    {{ operand1 }} = PyInt_FromLong(cbool_result);
+    {{ operand1 }} = Nuitka_PyInt_FromLong(cbool_result);
 {% endif %}
     {{ goto_exit(props, exit_result_ok) }}
 {% endif %}
@@ -331,7 +331,7 @@ exit_result_ok_clong:
 
     // That's our return value then. As we use a dedicated variable, it's
     // OK that way.
-    {{ operand1 }} = PyInt_FromLong(clong_result);
+    {{ operand1 }} = Nuitka_PyInt_FromLong(clong_result);
 {% endif %}
     {{ goto_exit(props, exit_result_ok) }}
 {% endif %}

nuitka/code_generation/templates_c/HelperSlotsLong.c.j2

@@ -202,7 +202,7 @@ exit_result_ok_clong:
 
     // That's our return value then. As we use a dedicated variable, it's
     // OK that way.
-    {{ operand1 }} = PyLong_FromLong(clong_result);
+    {{ operand1 }} = Nuitka_PyLong_FromLong(clong_result);
 {% endif %}
     {{ goto_exit(props, exit_result_ok) }}
 {% endif %}

nuitka/containers/Namedtuples.py

@@ -24,6 +24,12 @@ def makeNamedtupleClass(name, element_names):
         def asDict(self):
             return self._asdict()
 
+        def replace(self, **kwargs):
+            new_data = self.asDict()
+            new_data.update(**kwargs)
+
+            return self.__class__(**new_data)
+
     DynamicNamedtuple.__name__ = name
 
     return DynamicNamedtuple