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

nuitka/code_generation/BuiltinCodes.py

@@ -471,7 +471,14 @@ def getBuiltinCallViaSpecCode(spec, to_name, called_name, expression, emit, cont
     PyObject *args[] = {%(arg_value_names)s};
     char const *arg_names[] = {%(arg_names)s};
 
-    %(to_name)s = CALL_BUILTIN_KW_ARGS(tstate, %(called_name)s, args, arg_names, sizeof(args) / sizeof(PyObject *));
+    %(to_name)s = CALL_BUILTIN_KW_ARGS(
+        tstate,
+        %(called_name)s,
+        args,
+        arg_names,
+        sizeof(args) / sizeof(PyObject *),
+        %(kw_only_count)d
+    );
 }
 """
             % {
@@ -484,6 +491,7 @@ def getBuiltinCallViaSpecCode(spec, to_name, called_name, expression, emit, cont
                     (str(arg_value_name) if arg_value_name else "NULL")
                     for arg_value_name in arg_value_names
                 ),
+                "kw_only_count": spec.getKwOnlyParameterCount(),
             }
         )
 

nuitka/code_generation/CallCodes.py

@@ -193,28 +193,28 @@ def _getCallCodeKwSplitFromConstant(
     kw_names = tuple(item[0] for item in kw_items)
 
     if isMutable(values):
-        args_kwsplit_name = context.allocateTempName("call_args_kwsplit")
+        args_kw_split_name = context.allocateTempName("call_args_kw_split")
 
-        args_kwsplit_name.getCType().emitAssignmentCodeFromConstant(
-            to_name=args_kwsplit_name,
+        args_kw_split_name.getCType().emitAssignmentCodeFromConstant(
+            to_name=args_kw_split_name,
             constant=values,
             may_escape=True,
             emit=emit,
             context=context,
         )
-        split_name = args_kwsplit_name
+        split_name = args_kw_split_name
     else:
-        args_kwsplit_name = context.getConstantCode(values)
+        args_kw_split_name = context.getConstantCode(values)
         split_name = None
 
     emitLineNumberUpdateCode(expression, emit, context)
 
     emit(
-        """%s = CALL_FUNCTION_WITH_NO_ARGS_KWSPLIT(tstate, %s, &PyTuple_GET_ITEM(%s, 0), %s);"""
+        """%s = CALL_FUNCTION_WITH_NO_ARGS_KW_SPLIT(tstate, %s, &PyTuple_GET_ITEM(%s, 0), %s);"""
         % (
             to_name,
             called_name,
-            args_kwsplit_name,
+            args_kw_split_name,
             context.getConstantCode(kw_names),
         )
     )
@@ -238,7 +238,7 @@ def getCallCodeKwSplit(
 {
     PyObject *kw_values[%(kw_size)d] = {%(kw_value_names)s};
 
-    %(to_name)s = CALL_FUNCTION_WITH_NO_ARGS_KWSPLIT(tstate, %(called_name)s, kw_values, %(kw_names)s);
+    %(to_name)s = CALL_FUNCTION_WITH_NO_ARGS_KW_SPLIT(tstate, %(called_name)s, kw_values, %(kw_names)s);
 }
 """
         % {
@@ -347,7 +347,7 @@ def _generateCallCodeKwDict(
 
     emit(
         """\
-%(to_name)s = CALL_FUNCTION_WITH_KEYARGS(tstate, %(called_name)s, %(kw_dict_name)s);
+%(to_name)s = CALL_FUNCTION_WITH_KW_ARGS(tstate, %(called_name)s, %(kw_dict_name)s);
 """
         % {
             "to_name": to_name,
@@ -744,7 +744,7 @@ def _getCallCodeFromTuple(to_name, called_name, expression, args_value, emit, co
     # recreated for cases, e.g. when calling C functions, so this is a good way of
     # having them.
     if isMutable(args_value):
-        arg_tuple_name = context.allocateTempName("call_args_kwsplit")
+        arg_tuple_name = context.allocateTempName("call_args_tuple")
 
         arg_tuple_name.getCType().emitAssignmentCodeFromConstant(
             to_name=arg_tuple_name,
@@ -762,7 +762,7 @@ def _getCallCodeFromTuple(to_name, called_name, expression, args_value, emit, co
 
     emit(
         """\
-%s = CALL_FUNCTION_WITH_POSARGS%d(tstate, %s, %s);
+%s = CALL_FUNCTION_WITH_POS_ARGS%d(tstate, %s, %s);
 """
         % (to_name, arg_size, called_name, arg_tuple_name)
     )
@@ -790,7 +790,7 @@ def _getInstanceCallCodePosArgs(
     emitLineNumberUpdateCode(expression, emit, context)
 
     emit(
-        "%s = CALL_METHOD_WITH_POSARGS(%s, %s, %s);"
+        "%s = CALL_METHOD_WITH_POS_ARGS(%s, %s, %s);"
         % (to_name, called_name, called_attribute_name, args_name)
     )
 
@@ -809,7 +809,7 @@ def _getCallCodePosArgs(to_name, called_name, expression, args_name, emit, conte
     emitLineNumberUpdateCode(expression, emit, context)
 
     emit(
-        "%s = CALL_FUNCTION_WITH_POSARGS(tstate, %s, %s);"
+        "%s = CALL_FUNCTION_WITH_POS_ARGS(tstate, %s, %s);"
         % (to_name, called_name, args_name)
     )
 
@@ -855,7 +855,7 @@ def _getCallCodePosConstKeywordVariableArgs(
     quick_mixed_calls_used.add((args_count, True, True))
 
     if isMutable(args):
-        args_value_name = context.allocateTempName("call_posargs_values")
+        args_value_name = context.allocateTempName("call_pos_args_values")
 
         args_value_name.getCType().emitAssignmentCodeFromConstant(
             to_name=args_value_name,
@@ -875,7 +875,7 @@ def _getCallCodePosConstKeywordVariableArgs(
         """\
 {
     PyObject *kw_values[%(kw_size)d] = {%(kw_values)s};
-    %(to_name)s = CALL_FUNCTION_WITH_POSARGS%(args_count)d_KWSPLIT(\
+    %(to_name)s = CALL_FUNCTION_WITH_POS_ARGS%(args_count)d_KW_SPLIT(\
 tstate, %(called_name)s, %(pos_args)s, kw_values, %(kw_names)s);
 }
 """
@@ -962,7 +962,7 @@ def getCallCodePosVariableKeywordVariableArgs(
 {
     PyObject *args[] = {%(call_arg_names)s};
     PyObject *kw_values[%(kw_size)d] = {%(kw_value_names)s};
-    %(to_name)s = CALL_FUNCTION_WITH_ARGS%(args_count)d_KWSPLIT(tstate, %(called_name)s, args, kw_values, %(kw_names)s);
+    %(to_name)s = CALL_FUNCTION_WITH_ARGS%(args_count)d_KW_SPLIT(tstate, %(called_name)s, args, kw_values, %(kw_names)s);
 }
 """
         % {

nuitka/code_generation/CodeGeneration.py

@@ -275,6 +275,7 @@ from .PackageResourceCodes import (
     generateImportlibResourcesReadBinaryCallCode,
     generateImportlibResourcesReadTextCallCode,
     generateOsListdirCallCode,
+    generateOsLstatCallCode,
     generateOsPathAbspathCallCode,
     generateOsPathBasenameCallCode,
     generateOsPathDirnameCallCode,
@@ -283,6 +284,7 @@ from .PackageResourceCodes import (
     generateOsPathIsdirCallCode,
     generateOsPathIsfileCallCode,
     generateOsPathNormpathCallCode,
+    generateOsStatCallCode,
     generateOsUnameCallCode,
     generatePkglibGetDataCallCode,
     generatePkgResourcesDistributionValueCode,
@@ -345,7 +347,11 @@ from .SubscriptCodes import (
 from .TensorflowCodes import generateTensorflowFunctionCallCode
 from .TryCodes import generateTryCode
 from .TupleCodes import generateBuiltinTupleCode, generateTupleCreationCode
-from .TypeAliasCodes import generateTypeAliasCode
+from .TypeAliasCodes import (
+    generateTypeAliasCode,
+    generateTypeGenericCode,
+    generateTypeVarCode,
+)
 from .VariableCodes import (
     generateAssignmentVariableCode,
     generateDelVariableCode,
@@ -673,6 +679,7 @@ addExpressionDispatchDict(
         "EXPRESSION_BUILTIN_MAKE_EXCEPTION": generateBuiltinMakeExceptionCode,
         "EXPRESSION_BUILTIN_MAKE_EXCEPTION_IMPORT_ERROR": generateBuiltinMakeExceptionCode,
         "EXPRESSION_BUILTIN_MAKE_EXCEPTION_MODULE_NOT_FOUND_ERROR": generateBuiltinMakeExceptionCode,
+        "EXPRESSION_BUILTIN_MAKE_EXCEPTION_ATTRIBUTE_ERROR": generateBuiltinMakeExceptionCode,
         "EXPRESSION_BUILTIN_REF": generateBuiltinRefCode,
         "EXPRESSION_BUILTIN_WITH_CONTEXT_REF": generateBuiltinRefCode,
         "EXPRESSION_BUILTIN_EXCEPTION_REF": generateExceptionRefCode,
@@ -906,6 +913,8 @@ addExpressionDispatchDict(
         "EXPRESSION_SYS_EXIT_REF": generateImportModuleNameHardCode,
         "EXPRESSION_OS_UNAME_REF": generateImportModuleNameHardCode,
         "EXPRESSION_OS_LISTDIR_REF": generateImportModuleNameHardCode,
+        "EXPRESSION_OS_STAT_REF": generateImportModuleNameHardCode,
+        "EXPRESSION_OS_LSTAT_REF": generateImportModuleNameHardCode,
         "EXPRESSION_OS_PATH_EXISTS_REF": generateImportModuleNameHardCode,
         "EXPRESSION_OS_PATH_ISFILE_REF": generateImportModuleNameHardCode,
         "EXPRESSION_OS_PATH_ISDIR_REF": generateImportModuleNameHardCode,
@@ -945,7 +954,11 @@ addExpressionDispatchDict(
         "EXPRESSION_OS_PATH_NORMPATH_CALL": generateOsPathNormpathCallCode,
         "EXPRESSION_OS_PATH_ISABS_CALL": generateOsPathIsabsCallCode,
         "EXPRESSION_OS_LISTDIR_CALL": generateOsListdirCallCode,
+        "EXPRESSION_OS_STAT_CALL": generateOsStatCallCode,
+        "EXPRESSION_OS_LSTAT_CALL": generateOsLstatCallCode,
         "EXPRESSION_TYPE_ALIAS": generateTypeAliasCode,
+        "EXPRESSION_TYPE_VARIABLE": generateTypeVarCode,
+        "EXPRESSION_TYPE_MAKE_GENERIC": generateTypeGenericCode,
         "EXPRESSION_STR_OPERATION_FORMAT": generateStrFormatMethodCode,
         # TODO: Should have all of these generically or not. This one is required for now.
         "EXPRESSION_DICT_OPERATION_FROMKEYS_REF": generateDictOperationFromkeysRefCode,
@@ -1028,7 +1041,6 @@ setStatementDispatchDict(
         "STATEMENT_LOOP_BREAK": generateLoopBreakCode,
         "STATEMENT_LOOP_CONTINUE": generateLoopContinueCode,
         "STATEMENT_RAISE_EXCEPTION": generateRaiseCode,
-        "STATEMENT_RAISE_EXCEPTION_IMPLICIT": generateRaiseCode,
         "STATEMENT_RERAISE_EXCEPTION": generateReraiseCode,
         "STATEMENT_SPECIAL_UNPACK_CHECK": generateUnpackCheckCode,
         "STATEMENT_SPECIAL_UNPACK_CHECK_FROM_ITERATED": generateUnpackCheckFromIteratedCode,

nuitka/code_generation/CodeHelperSelection.py

@@ -50,7 +50,7 @@ def selectCodeHelper(
     if helper_function not in specialized_helpers_set:
         if (
             report_missing
-            and Options.is_report_missing
+            and Options.report_missing_code_helpers
             and (
                 not non_specialized_helpers_set
                 or helper_function not in non_specialized_helpers_set

nuitka/code_generation/CodeHelpers.py

@@ -180,7 +180,10 @@ def generateStatementCode(statement, emit, context):
         )
 
         # Complain if any temporary was not dealt with yet.
-        assert not context.getCleanupTempNames(), context.getCleanupTempNames()
+        assert not context.getCleanupTempNames(), (
+            statement.asXmlText(),
+            context.getCleanupTempNames(),
+        )
     except Exception:
         printError(
             "Problem with %r at %s"

nuitka/code_generation/CodeObjectCodes.py

@@ -23,7 +23,7 @@ def getCodeObjectsDeclCode(context):
 
     if context.getOwner().getFullName() == "__main__":
         statements.append('/* For use in "MainProgram.c". */')
-        statements.append("PyCodeObject *codeobj_main = NULL;")
+        statements.append("PyCodeObject *code_objects_main = NULL;")
 
     return statements
 
@@ -127,7 +127,7 @@ def getCodeObjectsInitCode(context):
 
         if context.getOwner().getFullName() == "__main__":
             if code_object_key[1] == "<module>":
-                statements.append("codeobj_main = %s;" % code_identifier)
+                statements.append("code_objects_main = %s;" % code_identifier)
 
     return statements
 

nuitka/code_generation/ComparisonCodes.py

@@ -73,7 +73,12 @@ def getRichComparisonCode(
         right_shape,
         left_c_type,
         right_c_type,
-    ) = decideExpressionCTypes(left=left, right=right, may_swap_arguments="always")
+    ) = decideExpressionCTypes(
+        left=left,
+        right=right,
+        may_swap_arguments="always",
+        context=context,
+    )
 
     if unknown_types:
         assert not needs_argument_swap
@@ -182,9 +187,13 @@ def getRichComparisonCode(
     if needs_argument_swap:
         arg1_name = right_name
         arg2_name = left_name
+        arg1_c_type = right_c_type
+        arg2_c_type = left_c_type
     else:
         arg1_name = left_name
         arg2_name = right_name
+        arg1_c_type = left_c_type
+        arg2_c_type = right_c_type
 
     # May need to convert return value.
     if helper_type is not target_type:
@@ -197,11 +206,13 @@ def getRichComparisonCode(
         value_name = to_name
 
     emit(
-        "%s = %s(%s, %s);"
+        "%s = %s(%s%s, %s%s);"
         % (
             value_name,
             helper_function,
+            "&" if arg1_c_type.isDualType() else "",
             arg1_name,
+            "&" if arg2_c_type.isDualType() else "",
             arg2_name,
         )
     )

nuitka/code_generation/ComparisonHelperDefinitions.py

@@ -44,6 +44,10 @@ def _makeTypeOps(type_name, may_raise_same_type, shortcut=False):
             if result_part == "CBOOL":
                 continue
 
+            # TODO: We want those as well, but we don't need them immediately.
+            if type_name in ("NILONG",):
+                continue
+
             yield "RICH_COMPARE_%s_%s_OBJECT_%s" % (comparator, result_part, type_name)
             yield "RICH_COMPARE_%s_%s_%s_OBJECT" % (comparator, result_part, type_name)
 
@@ -65,7 +69,7 @@ def _makeTypeOps(type_name, may_raise_same_type, shortcut=False):
             )
 
 
-def _makeFriendOps(type_name1, type_name2, may_raise):
+def _makeFriendOps(type_name1, type_name2, may_raise, shortcut):
     assert type_name1 != type_name2
 
     for result_part in "OBJECT", "CBOOL", "NBOOL":
@@ -73,7 +77,11 @@ def _makeFriendOps(type_name1, type_name2, may_raise):
             if result_part == "NBOOL":
                 continue
 
-        for comparator in rich_comparison_codes.values():
+        for comparator in (
+            rich_comparison_codes.values()
+            if not shortcut
+            else rich_comparison_subset_codes.values()
+        ):
             yield "RICH_COMPARE_%s_%s_%s_%s" % (
                 comparator,
                 result_part,
@@ -92,15 +100,22 @@ specialized_cmp_helpers_set = buildOrderedSet(
     _makeTypeOps("INT", may_raise_same_type=False, shortcut=True),
     _makeTypeOps("LONG", may_raise_same_type=False, shortcut=True),
     _makeTypeOps("FLOAT", may_raise_same_type=False, shortcut=True),
+    # Dual types
+    _makeTypeOps("NILONG", may_raise_same_type=False, shortcut=True),
     # TODO: What would shortcut mean, how do tuples compare their elements then?
-    _makeTypeOps("TUPLE", may_raise_same_type=True),
-    _makeTypeOps("LIST", may_raise_same_type=True),
+    _makeTypeOps("TUPLE", may_raise_same_type=True, shortcut=False),
+    _makeTypeOps("LIST", may_raise_same_type=True, shortcut=False),
     # Mixed Python types:
-    _makeFriendOps("LONG", "INT", may_raise=False),
+    # TODO: Absolutely possible to shortcut, why aren't we doing it?
+    _makeFriendOps("LONG", "INT", may_raise=False, shortcut=False),
     # Partial Python with C types
-    _makeFriendOps("INT", "CLONG", may_raise=False),
-    _makeFriendOps("LONG", "DIGIT", may_raise=False),
-    _makeFriendOps("FLOAT", "CFLOAT", may_raise=False),
+    # TODO: Absolutely possible to shortcut, why aren't we doing it?
+    _makeFriendOps("INT", "CLONG", may_raise=False, shortcut=False),
+    _makeFriendOps("LONG", "DIGIT", may_raise=False, shortcut=False),
+    _makeFriendOps("FLOAT", "CFLOAT", may_raise=False, shortcut=False),
+    # Partial dual types with C types, cannot shortcut as reverse argument versions are used.
+    _makeFriendOps("NILONG", "CLONG", may_raise=False, shortcut=False),
+    _makeFriendOps("NILONG", "DIGIT", may_raise=False, shortcut=False),
     # TODO: Add "CLONG_CLONG" type ops once we use that for local variables too.
 )
 

nuitka/code_generation/Contexts.py

@@ -49,7 +49,7 @@ class TempMixin(object):
         self.false_target = None
 
         self.keeper_variable_count = 0
-        self.exception_keepers = (None, None, None, None)
+        self.exception_keepers = (None, None)
 
         self.preserver_variable_declaration = {}
 
@@ -65,6 +65,9 @@ class TempMixin(object):
         # We might be hard coding too many details for special temps
         # here, pylint: disable=too-many-branches
 
+        # TODO: This should be achieved.
+        # assert not base_name.startswith("tmp_"), base_name
+
         if unique:
             number = None
         else:
@@ -169,24 +172,14 @@ class TempMixin(object):
         debug = Options.is_debug and python_version >= 0x300
 
         if debug:
-            keeper_obj_init = "NULL"
+            keeper_obj_init = "Empty_Nuitka_ExceptionPreservationItem"
         else:
             keeper_obj_init = None
 
         return (
             self.variable_storage.addVariableDeclarationTop(
-                "PyObject *",
-                "exception_keeper_type_%d" % self.keeper_variable_count,
-                keeper_obj_init,
-            ),
-            self.variable_storage.addVariableDeclarationTop(
-                "PyObject *",
-                "exception_keeper_value_%d" % self.keeper_variable_count,
-                keeper_obj_init,
-            ),
-            self.variable_storage.addVariableDeclarationTop(
-                "PyTracebackObject *",
-                "exception_keeper_tb_%d" % self.keeper_variable_count,
+                "struct Nuitka_ExceptionPreservationItem",
+                "exception_keeper_name_%d" % self.keeper_variable_count,
                 keeper_obj_init,
             ),
             self.variable_storage.addVariableDeclarationTop(
@@ -202,6 +195,7 @@ class TempMixin(object):
     def setExceptionKeeperVariables(self, keeper_vars):
         result = self.exception_keepers
         self.exception_keepers = tuple(keeper_vars)
+        assert len(self.exception_keepers) == 2
         return result
 
     def addExceptionPreserverVariables(self, preserver_id):
@@ -321,7 +315,7 @@ class CodeObjectsMixin(object):
         )
 
         if key not in self.code_objects:
-            self.code_objects[key] = "codeobj_%s" % self._calcHash(key)
+            self.code_objects[key] = "code_objects_%s" % self._calcHash(key)
 
         return self.code_objects[key]
 
@@ -570,6 +564,9 @@ class PythonChildContextBase(PythonContextBase):
     def addFunctionCreationInfo(self, creation_info):
         return self.parent.addFunctionCreationInfo(creation_info)
 
+    def setModuleVariableAccessorCaching(self, variable_name, caching):
+        self.parent.setModuleVariableAccessorCaching(variable_name, caching)
+
 
 class FrameDeclarationsMixin(object):
     # Mixins are not allowed to specify slots, pylint: disable=assigning-non-slot
@@ -606,7 +603,7 @@ class FrameDeclarationsMixin(object):
             )
 
         else:
-            frame_handle = code_identifier.replace("codeobj_", "frame_")
+            frame_handle = code_identifier.replace("code_objects_", "frame_")
 
             if self.frames_used > 1:
                 frame_handle += "_%d" % self.frames_used
@@ -772,6 +769,7 @@ class PythonModuleContext(
         "function_table_entries",
         "constant_accessor",
         "module_init_codes",
+        "module_variable_caching",
         # FrameDeclarationsMixin
         "frame_variables_stack",
         "frame_type_descriptions",
@@ -830,6 +828,8 @@ class PythonModuleContext(
 
         self.module_init_codes = []
 
+        self.module_variable_caching = {}
+
     def __repr__(self):
         return "<PythonModuleContext instance for module %s>" % self.name
 
@@ -839,6 +839,18 @@ class PythonModuleContext(
     def getEntryPoint(self):
         return self.module
 
+    def setModuleVariableAccessorCaching(self, variable_name, caching):
+        if caching:
+            self.module_variable_caching[variable_name] = True
+        elif variable_name not in self.module_variable_caching:
+            self.module_variable_caching[variable_name] = False
+
+    def isModuleVariableAccessorCaching(self, variable_name):
+        return self.module_variable_caching.get(variable_name, False)
+
+    def getModuleVariableAccessors(self):
+        return self.module_variable_caching
+
     def isCompiledPythonModule(self):
         return True
 

nuitka/code_generation/CoroutineCodes.py

@@ -87,17 +87,13 @@ def getCoroutineObjectCode(
 
     if needs_exception_exit:
         (
-            exception_type,
-            exception_value,
-            exception_tb,
+            exception_state_name,
             _exception_lineno,
         ) = context.variable_storage.getExceptionVariableDescriptions()
 
         generator_exit = template_coroutine_exception_exit % {
             "function_cleanup": indented(function_cleanup),
-            "exception_type": exception_type,
-            "exception_value": exception_value,
-            "exception_tb": exception_tb,
+            "exception_state_name": exception_state_name,
         }
     else:
         generator_exit = template_coroutine_noexception_exit % {

nuitka/code_generation/DictCodes.py

@@ -586,7 +586,7 @@ def generateDictOperationIteritemsCode(to_name, expression, emit, context):
     generateCAPIObjectCode(
         to_name=to_name,
         capi="DICT_ITERITEMS",
-        tstate=False,
+        tstate=True,
         arg_desc=(("dict_arg", expression.subnode_dict_arg),),
         may_raise=expression.mayRaiseException(BaseException),
         conversion_check=decideConversionCheckNeeded(to_name, expression),
@@ -628,7 +628,7 @@ def generateDictOperationIterkeysCode(to_name, expression, emit, context):
     generateCAPIObjectCode(
         to_name=to_name,
         capi="DICT_ITERKEYS",
-        tstate=False,
+        tstate=True,
         arg_desc=(("dict_arg", expression.subnode_dict_arg),),
         may_raise=False,
         conversion_check=decideConversionCheckNeeded(to_name, expression),
@@ -715,7 +715,7 @@ def generateDictOperationItervaluesCode(to_name, expression, emit, context):
     generateCAPIObjectCode(
         to_name=to_name,
         capi="DICT_ITERVALUES",
-        tstate=False,
+        tstate=True,
         arg_desc=(("dict_arg", expression.subnode_dict_arg),),
         may_raise=False,
         conversion_check=decideConversionCheckNeeded(to_name, expression),