Author: Ronan Lamy <ronan.l...@gmail.com>
Branch: framestate
Changeset: r75803:591f5aefe17b
Date: 2015-02-09 16:33 +0000
http://bitbucket.org/pypy/pypy/changeset/591f5aefe17b/

Log:    Start new bc_blocks after instructions that modify the blockstack

diff --git a/rpython/flowspace/bytecode.py b/rpython/flowspace/bytecode.py
--- a/rpython/flowspace/bytecode.py
+++ b/rpython/flowspace/bytecode.py
@@ -545,6 +545,7 @@
     def bc_flow(self, reader):
         reader.curr_block.operations.append(self)
         self.target = reader.get_block_at(self.arg)
+        reader.end_block()
 
     def do_signals(self, reader):
         reader.blockstack.append(self.make_block(-1))
@@ -593,6 +594,10 @@
 
 @bc_reader.register_opcode
 class POP_BLOCK(BCInstruction):
+    def bc_flow(self, reader):
+        reader.curr_block.operations.append(self)
+        reader.end_block()
+
     def do_signals(self, reader):
         reader.blockstack.pop()
 
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to