Nuitka-winsvc 2.3.11__cp311-cp311-win_amd64.whl → 2.4.1__cp311-cp311-win_amd64.whl

nuitka/tree/Building.py

@@ -38,12 +38,7 @@ catching and passing in exceptions raised.
 import marshal
 import os
 
-from nuitka import (
-    ModuleRegistry,
-    Options,
-    OutputDirectories,
-    SourceCodeReferences,
-)
+from nuitka import ModuleRegistry, OutputDirectories, SourceCodeReferences
 from nuitka.__past__ import long, unicode
 from nuitka.BytecodeCaching import (
     getCachedImportedModuleUsageAttempts,
@@ -118,7 +113,16 @@ from nuitka.nodes.VariableNameNodes import (
     StatementAssignmentVariableName,
 )
 from nuitka.optimizations.BytecodeDemotion import demoteSourceCodeToBytecode
-from nuitka.Options import shallWarnUnusualCode
+from nuitka.Options import (
+    getMainEntryPointFilenames,
+    hasPythonFlagNoSite,
+    hasPythonFlagPackageMode,
+    isShowMemory,
+    isStandaloneMode,
+    shallDisableBytecodeCacheUsage,
+    shallMakeModule,
+    shallWarnUnusualCode,
+)
 from nuitka.pgo.PGO import decideCompilationFromPGO
 from nuitka.plugins.Plugins import Plugins
 from nuitka.PythonVersions import python_version
@@ -284,9 +288,9 @@ def buildTryFinallyNode2(provider, node, source_ref):
 
 
 def buildTryNode(provider, node, source_ref):
-    # Note: This variant is used for Python3.3 or higher only, older stuff uses
-    # the above ones, this one merges try/except with try/finally in the
-    # "ast". We split it up again, as it's logically separated of course.
+    # Note: This variant is used for Python3 only, older stuff uses the above
+    # ones, this one merges try/except with try/finally in the "ast". We split
+    # it up again, as it's logically separated of course.
 
     # Shortcut missing try/finally.
     if not node.handlers:
@@ -779,19 +783,18 @@ setBuildingDispatchers(
 )
 
 
-def buildParseTree(provider, ast_tree, source_ref, is_module, is_main):
+def buildParseTree(provider, ast_tree, source_ref, is_main):
     # There are a bunch of branches here, mostly to deal with version
     # differences for module default variables. pylint: disable=too-many-branches
 
     # Maybe one day, we do exec inlining again, that is what this is for,
     # then is_module won't be True, for now it always is.
-    pushFutureSpec()
-    if is_module:
-        provider.setFutureSpec(getFutureSpec())
+    pushFutureSpec(provider.getFullName())
+    provider.setFutureSpec(getFutureSpec())
 
     body, doc = extractDocFromBody(ast_tree)
 
-    if is_module and is_main and python_version >= 0x360:
+    if is_main and python_version >= 0x360:
         provider.markAsNeedsAnnotationsDictionary()
 
     try:
@@ -812,106 +815,105 @@ def buildParseTree(provider, ast_tree, source_ref, is_module, is_main):
 
     statements = []
 
-    if is_module:
-        # Add import of "site" module of main programs visibly in the node tree,
-        # so recursion and optimization can pick it up, checking its effects.
-        if is_main and not Options.hasPythonFlagNoSite():
+    # Add import of "site" module of main programs visibly in the node tree,
+    # so recursion and optimization can pick it up, checking its effects.
+    if is_main and not hasPythonFlagNoSite():
+        statements.append(
+            StatementExpressionOnly(
+                expression=makeExpressionImportModuleFixed(
+                    using_module_name=provider.getParentModule().getFullName(),
+                    module_name="site",
+                    value_name="site",
+                    source_ref=source_ref,
+                ),
+                source_ref=source_ref,
+            )
+        )
+
+        for path_imported_name in getPthImportedPackages():
+            if isHardModuleWithoutSideEffect(path_imported_name):
+                continue
+
             statements.append(
                 StatementExpressionOnly(
                     expression=makeExpressionImportModuleFixed(
                         using_module_name=provider.getParentModule().getFullName(),
-                        module_name="site",
-                        value_name="site",
+                        module_name=path_imported_name,
+                        value_name=path_imported_name.getTopLevelPackageName(),
                         source_ref=source_ref,
                     ),
                     source_ref=source_ref,
                 )
             )
 
-            for path_imported_name in getPthImportedPackages():
-                if isHardModuleWithoutSideEffect(path_imported_name):
-                    continue
-
-                statements.append(
-                    StatementExpressionOnly(
-                        expression=makeExpressionImportModuleFixed(
-                            using_module_name=provider.getParentModule().getFullName(),
-                            module_name=path_imported_name,
-                            value_name=path_imported_name.getTopLevelPackageName(),
-                            source_ref=source_ref,
-                        ),
-                        source_ref=source_ref,
-                    )
-                )
+    statements.append(
+        StatementAssignmentVariableName(
+            provider=provider,
+            variable_name="__doc__",
+            source=makeConstantRefNode(
+                constant=doc, source_ref=internal_source_ref, user_provided=True
+            ),
+            source_ref=internal_source_ref,
+        )
+    )
 
-        statements.append(
-            StatementAssignmentVariableName(
-                provider=provider,
-                variable_name="__doc__",
-                source=makeConstantRefNode(
-                    constant=doc, source_ref=internal_source_ref, user_provided=True
-                ),
+    statements.append(
+        StatementAssignmentVariableName(
+            provider=provider,
+            variable_name="__file__",
+            source=ExpressionModuleAttributeFileRef(
+                variable=provider.getVariableForReference("__file__"),
                 source_ref=internal_source_ref,
-            )
+            ),
+            source_ref=internal_source_ref,
         )
+    )
 
-        statements.append(
-            StatementAssignmentVariableName(
-                provider=provider,
-                variable_name="__file__",
+    if provider.isCompiledPythonPackage():
+        # This assigns "__path__" value.
+        statements.append(createPathAssignment(provider, internal_source_ref))
+
+    if python_version >= 0x340 and not is_main:
+        statements += (
+            StatementAssignmentAttribute(
+                expression=ExpressionModuleAttributeSpecRef(
+                    variable=provider.getVariableForReference("__spec__"),
+                    source_ref=internal_source_ref,
+                ),
+                attribute_name="origin",
                 source=ExpressionModuleAttributeFileRef(
                     variable=provider.getVariableForReference("__file__"),
                     source_ref=internal_source_ref,
                 ),
                 source_ref=internal_source_ref,
-            )
+            ),
+            StatementAssignmentAttribute(
+                expression=ExpressionModuleAttributeSpecRef(
+                    variable=provider.getVariableForReference("__spec__"),
+                    source_ref=internal_source_ref,
+                ),
+                attribute_name="has_location",
+                source=makeConstantRefNode(True, internal_source_ref),
+                source_ref=internal_source_ref,
+            ),
         )
 
         if provider.isCompiledPythonPackage():
-            # This assigns "__path__" value.
-            statements.append(createPathAssignment(provider, internal_source_ref))
-
-        if python_version >= 0x340 and not is_main:
-            statements += (
+            statements.append(
                 StatementAssignmentAttribute(
                     expression=ExpressionModuleAttributeSpecRef(
                         variable=provider.getVariableForReference("__spec__"),
                         source_ref=internal_source_ref,
                     ),
-                    attribute_name="origin",
-                    source=ExpressionModuleAttributeFileRef(
-                        variable=provider.getVariableForReference("__file__"),
+                    attribute_name="submodule_search_locations",
+                    source=ExpressionVariableNameRef(
+                        provider=provider,
+                        variable_name="__path__",
                         source_ref=internal_source_ref,
                     ),
                     source_ref=internal_source_ref,
-                ),
-                StatementAssignmentAttribute(
-                    expression=ExpressionModuleAttributeSpecRef(
-                        variable=provider.getVariableForReference("__spec__"),
-                        source_ref=internal_source_ref,
-                    ),
-                    attribute_name="has_location",
-                    source=makeConstantRefNode(True, internal_source_ref),
-                    source_ref=internal_source_ref,
-                ),
-            )
-
-            if provider.isCompiledPythonPackage():
-                statements.append(
-                    StatementAssignmentAttribute(
-                        expression=ExpressionModuleAttributeSpecRef(
-                            variable=provider.getVariableForReference("__spec__"),
-                            source_ref=internal_source_ref,
-                        ),
-                        attribute_name="submodule_search_locations",
-                        source=ExpressionVariableNameRef(
-                            provider=provider,
-                            variable_name="__path__",
-                            source_ref=internal_source_ref,
-                        ),
-                        source_ref=internal_source_ref,
-                    )
                 )
+            )
 
     if python_version >= 0x300:
         statements.append(
@@ -970,16 +972,13 @@ def buildParseTree(provider, ast_tree, source_ref, is_module, is_main):
             )
         )
 
-    if is_module:
-        result = makeModuleFrame(
-            module=provider, statements=statements, source_ref=source_ref
-        )
+    result = makeModuleFrame(
+        module=provider, statements=statements, source_ref=source_ref
+    )
 
-        popFutureSpec()
+    popFutureSpec()
 
-        return result
-    else:
-        assert False
+    return result
 
 
 def decideCompilationMode(is_top, module_name, module_filename, for_pgo):
@@ -1115,7 +1114,7 @@ def _createModule(
         if (
             mode == "bytecode"
             and not is_top
-            and not Options.shallDisableBytecodeCacheUsage()
+            and not shallDisableBytecodeCacheUsage()
             and hasCachedImportedModuleUsageAttempts(
                 module_name=module_name, source_code=source_code, source_ref=source_ref
             )
@@ -1154,14 +1153,13 @@ def _createModule(
 
 
 def createModuleTree(module, source_ref, ast_tree, is_main):
-    if Options.isShowMemory():
+    if isShowMemory():
         memory_watch = MemoryUsage.MemoryWatch()
 
     module_body = buildParseTree(
         provider=module,
         ast_tree=ast_tree,
         source_ref=source_ref,
-        is_module=True,
         is_main=is_main,
     )
 
@@ -1172,17 +1170,19 @@ def createModuleTree(module, source_ref, ast_tree, is_main):
 
     completeVariableClosures(module)
 
-    if Options.isShowMemory():
+    if isShowMemory():
         memory_watch.finish(
             "Memory usage changed loading module '%s'" % module.getFullName()
         )
 
 
-def buildMainModuleTree(filename, source_code):
+def buildMainModuleTree(source_code):
     # Detect to be frozen modules if any, so we can consider to not follow
     # to them.
 
-    if Options.shallMakeModule():
+    filename = getMainEntryPointFilenames()[0]
+
+    if shallMakeModule():
         module_name = Importing.getModuleNameAndKindFromFilename(filename)[0]
 
         if module_name is None:
@@ -1192,7 +1192,7 @@ def buildMainModuleTree(filename, source_code):
             )
     else:
         # TODO: Doesn't work for deeply nested packages at all.
-        if Options.hasPythonFlagPackageMode():
+        if hasPythonFlagPackageMode():
             module_name = ModuleName(os.path.basename(filename) + ".__main__")
         else:
             module_name = ModuleName("__main__")
@@ -1203,13 +1203,13 @@ def buildMainModuleTree(filename, source_code):
         module_filename=filename,
         source_code=source_code,
         is_top=True,
-        is_main=not Options.shallMakeModule(),
+        is_main=not shallMakeModule(),
         module_kind="py",
         is_fake=source_code is not None,
         hide_syntax_error=False,
     )
 
-    if Options.isStandaloneMode():
+    if isStandaloneMode():
         module.setStandardLibraryModules(
             early_module_names=detectEarlyImports(),
             stdlib_modules_names=detectStdlibAutoInclusionModules(),
@@ -1241,7 +1241,7 @@ Cannot follow import to module '%s' because of '%s'."""
         reason=reason,
         is_top=False,
         mode="compiled",
-        future_spec=FutureSpec(),
+        future_spec=FutureSpec(use_annotations=False),
         source_ref=source_ref,
     )
 
@@ -1268,6 +1268,7 @@ def _makeModuleBodyTooComplex(
         Importing.warned_about.add(module_filename)
 
         # Known harmless case, not causing issues, lets not warn about it.
+        # spell-checker: ignore sympy,numberfields
         if module_name != "sympy.polys.numberfields.resolvent_lookup":
             recursion_logger.info(
                 """\
@@ -1314,8 +1315,8 @@ def buildModule(
         logger=general,
     )
 
-    if Options.hasPythonFlagPackageMode():
-        if is_top and Options.shallMakeModule():
+    if hasPythonFlagPackageMode():
+        if is_top and shallMakeModule():
             optimization_logger.warning(
                 "Python flag -m (package_mode) has no effect in module mode, it's only for executables."
             )

nuitka/tree/ComplexCallHelperFunctions.py

@@ -59,7 +59,6 @@ from nuitka.nodes.VariableRefNodes import (
     ExpressionTempVariableRef,
     ExpressionVariableRef,
 )
-from nuitka.nodes.VariableReleaseNodes import makeStatementsReleaseVariables
 from nuitka.PythonVersions import (
     getComplexCallSequenceErrorTemplate,
     python_version,
@@ -72,7 +71,7 @@ from .InternalModule import (
     once_decorator,
 )
 from .ReformulationTryExceptStatements import makeTryExceptSingleHandlerNode
-from .ReformulationTryFinallyStatements import makeTryFinallyStatement
+from .ReformulationTryFinallyStatements import makeTryFinallyReleaseStatement
 from .TreeHelpers import (
     makeCallNode,
     makeStatementsSequenceFromStatement,
@@ -643,17 +642,14 @@ def _makeStarDictArgumentToDictStatement(result, called_variable, star_dict_vari
         source_ref=internal_source_ref,
     )
 
-    return makeTryFinallyStatement(
+    return makeTryFinallyReleaseStatement(
         provider=result,
         tried=tried,
-        final=makeStatementsReleaseVariables(
-            variables=(
-                tmp_dict_variable,
-                tmp_iter_variable,
-                tmp_keys_variable,
-                tmp_key_variable,
-            ),
-            source_ref=internal_source_ref,
+        variables=(
+            tmp_dict_variable,
+            tmp_iter_variable,
+            tmp_keys_variable,
+            tmp_key_variable,
         ),
         source_ref=internal_source_ref,
     )
@@ -975,13 +971,10 @@ def _makeStarDictArgumentMergeToKwStatement(
         source_ref=internal_source_ref,
     )
 
-    return makeTryFinallyStatement(
+    return makeTryFinallyReleaseStatement(
         provider=result,
         tried=tried,
-        final=makeStatementsReleaseVariables(
-            variables=tmp_variables,
-            source_ref=internal_source_ref,
-        ),
+        variables=tmp_variables,
         source_ref=internal_source_ref,
     )
 
@@ -2118,18 +2111,15 @@ def getFunctionCallHelperDictionaryUnpacking():
     )
 
     body = makeStatementsSequenceFromStatement(
-        makeTryFinallyStatement(
+        makeTryFinallyReleaseStatement(
             provider=result,
             tried=tried,
-            final=makeStatementsReleaseVariables(
-                variables=(
-                    tmp_result_variable,
-                    tmp_iter_variable,
-                    tmp_item_variable,
-                    tmp_iter2_variable,
-                    tmp_key_variable,
-                ),
-                source_ref=internal_source_ref,
+            variables=(
+                tmp_result_variable,
+                tmp_iter_variable,
+                tmp_item_variable,
+                tmp_iter2_variable,
+                tmp_key_variable,
             ),
             source_ref=internal_source_ref,
         )

nuitka/tree/InternalModule.py

@@ -48,7 +48,15 @@ def getInternalModule():
     return getRootTopModule()
 
 
+_internal_helper_names = set()
+
+
 def makeInternalHelperFunctionBody(name, parameters, inline_const_args=False):
+    # Make sure names of helpers are unique, the code names we choose require
+    # that to be true.
+    assert name not in _internal_helper_names
+    _internal_helper_names.add(name)
+
     if inline_const_args:
         node_class = ExpressionFunctionPureInlineConstBody
     else:

nuitka/tree/ReformulationAssignmentStatements.py

@@ -63,16 +63,12 @@ from nuitka.nodes.VariableNameNodes import (
     StatementDelVariableName,
 )
 from nuitka.nodes.VariableRefNodes import ExpressionTempVariableRef
-from nuitka.nodes.VariableReleaseNodes import (
-    makeStatementReleaseVariable,
-    makeStatementsReleaseVariables,
-)
-from nuitka.Options import hasPythonFlagNoAnnotations, isExperimental
+from nuitka.Options import isExperimental
 from nuitka.PythonVersions import python_version
 from nuitka.Tracing import general
 
 from .ReformulationImportStatements import getFutureSpec
-from .ReformulationTryFinallyStatements import makeTryFinallyStatement
+from .ReformulationTryFinallyStatements import makeTryFinallyReleaseStatement
 from .SyntaxErrors import raiseSyntaxError
 from .TreeHelpers import (
     buildAnnotationNode,
@@ -340,14 +336,10 @@ not enough values to unpack (expected at least %d, got %%d)"""
                 source=iter_creation_class(value=source, source_ref=source_ref),
                 source_ref=source_ref,
             ),
-            makeTryFinallyStatement(
+            makeTryFinallyReleaseStatement(
                 provider=provider,
                 tried=statements,
-                final=(
-                    makeStatementReleaseVariable(
-                        variable=source_iter_var, source_ref=source_ref
-                    ),
-                ),
+                variables=(source_iter_var,),
                 source_ref=source_ref,
             ),
         ]
@@ -380,19 +372,10 @@ not enough values to unpack (expected at least %d, got %%d)"""
                 )
             )
 
-        final_statements = []
-
-        for element_var in element_vars:
-            final_statements.append(
-                makeStatementReleaseVariable(
-                    variable=element_var, source_ref=source_ref
-                )
-            )
-
-        return makeTryFinallyStatement(
+        return makeTryFinallyReleaseStatement(
             provider=provider,
             tried=statements,
-            final=final_statements,
+            variables=element_vars,
             source_ref=source_ref,
         )
     elif kind == "Starred":
@@ -504,6 +487,7 @@ def decodeAssignTarget(provider, node, source_ref, allow_none=False):
         else:
             assert False, slice_kind
     elif kind in ("Tuple", "List"):
+        # That is the ast names, spell-checker: ignore elts
         return (
             "Tuple",
             tuple(
@@ -575,22 +559,23 @@ def buildAssignNode(provider, node, source_ref):
                 )
             )
 
-        return makeTryFinallyStatement(
+        return makeTryFinallyReleaseStatement(
             provider=provider,
             tried=statements,
-            final=makeStatementReleaseVariable(
-                variable=tmp_source, source_ref=source_ref
-            ),
+            variables=(tmp_source,),
             source_ref=source_ref,
         )
 
 
 def buildAnnAssignNode(provider, node, source_ref):
     """Python3.6 annotation assignment."""
-    # There are many cases to deal with here.
+    # There are many cases to deal with here, pylint: disable=too-many-branches
 
-    if provider.isCompiledPythonModule() or provider.isExpressionClassBodyBase():
-        provider.markAsNeedsAnnotationsDictionary()
+    use_annotations = getFutureSpec().shallUseAnnotations()
+
+    if use_annotations:
+        if provider.isCompiledPythonModule() or provider.isExpressionClassBodyBase():
+            provider.markAsNeedsAnnotationsDictionary()
 
     # Evaluate the right hand side first, so it can get names provided
     # before the left hand side exists.
@@ -627,7 +612,7 @@ def buildAnnAssignNode(provider, node, source_ref):
     # Only annotations for modules and classes are really made, for functions
     # they are ignored like comments.
     if variable_name is not None:
-        if not hasPythonFlagNoAnnotations() and (
+        if use_annotations and (
             provider.isExpressionClassBodyBase() or provider.isCompiledPythonModule()
         ):
             annotation = buildAnnotationNode(provider, node.annotation, source_ref)
@@ -830,12 +815,10 @@ def _buildInplaceAssignAttributeNode(
     return (
         preserve_to_tmp,
         # making sure the above temporary variable is deleted in any case.
-        makeTryFinallyStatement(
+        makeTryFinallyReleaseStatement(
             provider=provider,
             tried=(inplace_to_tmp, copy_back_from_tmp),
-            final=makeStatementReleaseVariable(
-                variable=tmp_variable, source_ref=source_ref
-            ),
+            variables=(tmp_variable,),
             source_ref=source_ref,
         ),
     )
@@ -902,13 +885,10 @@ def _buildInplaceAssignSubscriptNode(
 
     return (
         preserve_to_tmp1,
-        makeTryFinallyStatement(
+        makeTryFinallyReleaseStatement(
             provider=provider,
             tried=statements,
-            final=makeStatementsReleaseVariables(
-                variables=(tmp_variable1, tmp_variable2, tmp_variable3),
-                source_ref=source_ref,
-            ),
+            variables=(tmp_variable1, tmp_variable2, tmp_variable3),
             source_ref=source_ref,
         ),
     )
@@ -936,9 +916,7 @@ def _buildInplaceAssignSliceNode(
         variable=tmp_variable1, source=lookup_source, source_ref=source_ref
     )
 
-    final_statements = [
-        makeStatementReleaseVariable(variable=tmp_variable1, source_ref=source_ref)
-    ]
+    release_variables = [tmp_variable1]
     statements = []
 
     if lower is not None:
@@ -947,9 +925,7 @@ def _buildInplaceAssignSliceNode(
                 variable=tmp_variable2, source=lower, source_ref=source_ref
             )
         )
-        final_statements.append(
-            makeStatementReleaseVariable(variable=tmp_variable2, source_ref=source_ref)
-        )
+        release_variables.append(tmp_variable2)
 
         lower_ref1 = ExpressionTempVariableRef(
             variable=tmp_variable2, source_ref=source_ref
@@ -968,9 +944,7 @@ def _buildInplaceAssignSliceNode(
                 variable=tmp_variable3, source=upper, source_ref=source_ref
             )
         )
-        final_statements.append(
-            makeStatementReleaseVariable(variable=tmp_variable3, source_ref=source_ref)
-        )
+        release_variables.append(tmp_variable3)
 
         upper_ref1 = ExpressionTempVariableRef(
             variable=tmp_variable3, source_ref=source_ref
@@ -1068,16 +1042,14 @@ def _buildInplaceAssignSliceNode(
             ),
         )
 
-    final_statements.append(
-        makeStatementReleaseVariable(variable=tmp_variable4, source_ref=source_ref)
-    )
+    release_variables.append(tmp_variable4)
 
     return (
         copy_to_tmp,
-        makeTryFinallyStatement(
+        makeTryFinallyReleaseStatement(
             provider=provider,
             tried=statements,
-            final=final_statements,
+            variables=release_variables,
             source_ref=source_ref,
         ),
     )
@@ -1122,7 +1094,7 @@ def buildInplaceAssignNode(provider, node, source_ref):
     elif kind == "Subscript":
         subscribed, subscript = detail
 
-        temp_scope = provider.allocateTempScope("inplace_assign_subscr")
+        temp_scope = provider.allocateTempScope("inplace_assign_subscript")
 
         tmp_variable1 = provider.allocateTempVariable(
             temp_scope=temp_scope, name="target", temp_type="object"
@@ -1237,12 +1209,10 @@ def buildNamedExprNode(provider, node, source_ref):
 
     outline_body.setChildBody(
         makeStatementsSequenceFromStatement(
-            statement=makeTryFinallyStatement(
+            statement=makeTryFinallyReleaseStatement(
                 provider=provider,
                 tried=statements,
-                final=makeStatementReleaseVariable(
-                    variable=tmp_value, source_ref=source_ref
-                ),
+                variables=(tmp_value,),
                 source_ref=source_ref,
             )
         )