Merge branch 'hotfix/0.6.10.5'

Author: kayhayen

debian/changelog

@@ -1,3 +1,9 @@
+nuitka (0.6.10.5+ds-1) unstable; urgency=medium
+
+  * New upstream hotfix release.
+
+ -- Kay Hayen <kay.hayen@gmail.com>  Thu, 07 Jan 2021 11:04:59 +0100
+
 nuitka (0.6.10.4+ds-1) unstable; urgency=medium
 
   * New upstream hotfix release.

nuitka/Version.py

@@ -20,7 +20,7 @@
 """
 
 version_string = """\
-Nuitka V0.6.10.4
+Nuitka V0.6.10.5
 Copyright (C) 2020 Kay Hayen."""
 
 

nuitka/codegen/Contexts.py

@@ -591,7 +591,7 @@ def __init__(self):
         # Currently active frame stack inside the context.
         self.frame_stack = [None]
 
-        self.locals_dict_names = set()
+        self.locals_dict_names = None
 
     def getFrameHandle(self):
         return self.frame_stack[-1]
@@ -689,7 +689,7 @@ def getFrameVariableCodeNames(self):
         return result
 
     def getLocalsDictNames(self):
-        return self.locals_dict_names
+        return self.locals_dict_names or ()
 
     def addLocalsDictName(self, locals_dict_name):
         result = self.variable_storage.getVariableDeclarationTop(locals_dict_name)
@@ -699,6 +699,9 @@ def addLocalsDictName(self, locals_dict_name):
                 "PyObject *", locals_dict_name, "NULL"
             )
 
+        if self.locals_dict_names is None:
+            self.locals_dict_names = set()
+
         self.locals_dict_names.add(result)
 
         return result

nuitka/codegen/FunctionCodes.py

@@ -567,8 +567,9 @@ def setupFunctionLocalVariables(
 def finalizeFunctionLocalVariables(context):
     function_cleanup = []
 
-    # TODO: Many times this will not be necessary.
-    for locals_declaration in context.getLocalsDictNames():
+    # TODO: Many times it will not be necessary to release locals dict, because
+    # they already were, but our tracing doesn't yet allow us to know.
+    for locals_declaration in sorted(context.getLocalsDictNames(), key=str):
         function_cleanup.append(
             "Py_XDECREF(%(locals_dict)s);\n" % {"locals_dict": locals_declaration}
         )

nuitka/codegen/IdCodes.py

@@ -41,7 +41,7 @@ def generateBuiltinHashCode(to_name, expression, emit, context):
         to_name=to_name,
         capi="BUILTIN_HASH",
         arg_desc=(("hash_arg", expression.getValue()),),
-        may_raise=expression.mayRaiseException(BaseException),
+        may_raise=expression.mayRaiseExceptionOperation(),
         conversion_check=decideConversionCheckNeeded(to_name, expression),
         source_ref=expression.getCompatibleSourceReference(),
         emit=emit,

nuitka/nodes/BuiltinHashNodes.py

@@ -36,13 +36,21 @@ def __init__(self, value, source_ref):
         ExpressionChildHavingBase.__init__(self, value=value, source_ref=source_ref)
 
     def computeExpression(self, trace_collection):
-        value = self.getValue()
+        value = self.subnode_value
 
-        # TODO: Have a computation slot for hashing.
+        # TODO: Have a computation slot for hashing and specialize for known cases.
         if not value.isKnownToBeHashable():
             trace_collection.onExceptionRaiseExit(BaseException)
 
+        # TODO: Static raise if it's known not to be hashable.
+
         return self, None, None
 
     def mayRaiseException(self, exception_type):
-        return not self.getValue().isKnownToBeHashable()
+        return (
+            self.subnode_value.mayRaiseException(exception_type)
+            or not self.subnode_value.isKnownToBeHashable()
+        )
+
+    def mayRaiseExceptionOperation(self):
+        return not self.subnode_value.isKnownToBeHashable()

nuitka/nodes/ComparisonNodes.py

@@ -45,6 +45,10 @@ def __init__(self, left, right, source_ref):
             self, values={"left": left, "right": right}, source_ref=source_ref
         )
 
+    @staticmethod
+    def copyTraceStateFrom(source):
+        pass
+
     def getOperands(self):
         return (self.getLeft(), self.getRight())
 
@@ -98,6 +102,8 @@ def computeExpressionOperationNot(self, not_node, trace_collection):
                 source_ref=self.source_ref,
             )
 
+            result.copyTraceStateFrom(self)
+
             return (
                 result,
                 "new_expression",
@@ -123,6 +129,10 @@ def getTypeShape(self):
     def getDetails(self):
         return {}
 
+    def copyTraceStateFrom(self, source):
+        self.type_shape = source.type_shape
+        self.escape_desc = source.escape_desc
+
     def canCreateUnsupportedException(self):
         return hasattr(self.subnode_left.getTypeShape(), "typical_value") and hasattr(
             self.subnode_right.getTypeShape(), "typical_value"