If no parents don't make next block current

7e1483e9 · Vitja Makarov · 2a0ee6a6 · 7e1483e9
Commit 7e1483e9 authored May 20, 2011 by Vitja Makarov
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 3 deletions

Cython/Compiler/FlowControl.py Cython/Compiler/FlowControl.py +15 -3

No files found.
--- a/Cython/Compiler/FlowControl.py
+++ b/Cython/Compiler/FlowControl.py
@@ -741,7 +741,11 @@ class CreateControlFlowGraph(CythonTransform):
                self.flow.block.add_child(next_block)
        else:
            condition_block.add_child(next_block)
-        self.flow.block = next_block
+
+        if next_block.parents:
+            self.flow.block = next_block
+        else:
+            self.flow.block = None
        return node

    def visit_ForInStatNode(self, node):
@@ -768,7 +772,11 @@ class CreateControlFlowGraph(CythonTransform):
                self.flow.block.add_child(next_block)
        else:
            condition_block.add_child(next_block)
-        self.flow.block = next_block
+
+        if next_block.parents:
+            self.flow.block = next_block
+        else:
+            self.flow.block = None
        return node

    def visit_ForFromStatNode(self, node):
@@ -799,7 +807,11 @@ class CreateControlFlowGraph(CythonTransform):
                self.flow.block.add_child(next_block)
        else:
            condition_block.add_child(next_block)
-        self.flow.block = next_block
+
+        if next_block.parents:
+            self.flow.block = next_block
+        else:
+            self.flow.block = None
        return node

    def visit_LoopNode(self, node):