Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: share-guard-info
Changeset: r79756:e7b232b9edd9
Date: 2015-09-22 11:31 +0200
http://bitbucket.org/pypy/pypy/changeset/e7b232b9edd9/
Log: fix flatten.py for the common case
diff --git a/rpython/jit/codewriter/flatten.py
b/rpython/jit/codewriter/flatten.py
--- a/rpython/jit/codewriter/flatten.py
+++ b/rpython/jit/codewriter/flatten.py
@@ -118,7 +118,7 @@
operations = block.operations
for i, op in enumerate(operations):
if '_ovf' in op.opname:
- if (len(block.exits) != 2 or
+ if (len(block.exits) not in (2, 3) or
block.exitswitch is not c_last_exception):
raise Exception("detected a block containing ovfcheck()"
" but no OverflowError is caught, this"
@@ -194,10 +194,13 @@
line = self.popline()
self.emitline(opname[:7] + '_jump_if_ovf',
TLabel(block.exits[1]), *line[1:])
- assert len(block.exits) == 2
+ assert len(block.exits) in (2, 3)
self.make_link(block.exits[0], False)
self.emitline(Label(block.exits[1]))
self.make_exception_link(block.exits[1], True)
+ if len(block.exits) == 3:
+ assert block.exits[2].exitcase is Exception
+ self.make_exception_link(block.exits[2], False)
return
else:
while True:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
