merge

Cython/Compiler/FlowControl.py

@@ -193,9 +193,11 @@ class ControlFlow(object):
     def mark_reference(self, node, entry):
         if self.block and self.is_tracked(entry):
             self.block.stats.append(NameReference(node, entry))
-            # Local variable is definitely bound after this reference
-            if not node.allow_null:
-                self.block.bounded.add(entry)
+            ## XXX: We don't track expression evaluation order so we can't use
+            ## XXX: successful reference as initialization sign.
+            ## # Local variable is definitely bound after this reference
+            ## if not node.allow_null:
+            ##     self.block.bounded.add(entry)
             self.entries.add(entry)
 
     def normalize(self):
@@ -548,9 +550,9 @@ def check_definitions(flow, compiler_directives):
                 references[stat.node] = stat.entry
                 stat.entry.cf_references.append(stat)
                 stat.node.cf_state.update(state)
-                if not stat.node.allow_null:
-                    i_state &= ~i_assmts.bit
-                # after successful read, the state is known to be initialised
+                ## if not stat.node.allow_null:
+                ##     i_state &= ~i_assmts.bit
+                ## # after successful read, the state is known to be initialised
                 state.discard(Uninitialized)
                 state.discard(Unknown)
                 for assmt in state:
@@ -1121,6 +1123,7 @@ class ControlFlowAnalysis(CythonTransform):
         ## XXX: links to exception handling point should be added by
         ## XXX: children nodes
         self.flow.block.add_child(entry_point)
+        self.flow.nextblock()
         self._visit(node.body)
         self.flow.exceptions.pop()
 
@@ -1181,6 +1184,7 @@ class ControlFlowAnalysis(CythonTransform):
         self.flow.block = body_block
         ## XXX: Is it still required
         body_block.add_child(entry_point)
+        self.flow.nextblock()
         self._visit(node.body)
         self.flow.exceptions.pop()
         if self.flow.loops:

tests/memoryview/memoryview.pyx

@@ -175,6 +175,7 @@ def test_cdef_attribute():
     >>> test_cdef_attribute()
     Memoryview is not initialized
     local variable 'myview' referenced before assignment
+    local variable 'myview' referenced before assignment
     get_ext_obj called
     Memoryview is not initialized
     <MemoryView of 'array' object>
@@ -195,8 +196,11 @@ def test_cdef_attribute():
     else:
         print "No UnboundLocalError was raised"
 
-    # uninitialized assignment is valid
-    cdef int[:] otherview = myview
+    cdef int[:] otherview
+    try:
+         otherview = myview
+    except UnboundLocalError, e:
+        print e.args[0]
 
     try:
         print get_ext_obj().mview

tests/run/uninitialized.py

@@ -129,3 +129,51 @@ def test_class(cond):
         class A:
             x = 1
     return A.x
+
+
+def test_try_except_regression(c):
+    """
+    >>> test_try_except_regression(True)
+    (123,)
+    >>> test_try_except_regression(False)
+    Traceback (most recent call last):
+    ...
+    UnboundLocalError: local variable 'a' referenced before assignment
+    """
+    if c:
+        a = (123,)
+    try:
+        return a
+    except:
+        return a
+
+
+def test_try_finally_regression(c):
+    """
+    >>> test_try_finally_regression(True)
+    (123,)
+    >>> test_try_finally_regression(False)
+    Traceback (most recent call last):
+    ...
+    UnboundLocalError: local variable 'a' referenced before assignment
+    """
+    if c:
+        a = (123,)
+    try:
+        return a
+    finally:
+        return a
+
+
+def test_expression_calculation_order_bug(a):
+    """
+    >>> test_expression_calculation_order_bug(False)
+    []
+    >>> test_expression_calculation_order_bug(True)
+    Traceback (most recent call last):
+    ...
+    UnboundLocalError: local variable 'b' referenced before assignment
+    """
+    if not a:
+        b = []
+    return (a or b) and (b or a)