Author: Alex Gaynor <[email protected]>
Branch:
Changeset: r47825:cdb51e95efd2
Date: 2011-10-05 02:14 -0400
http://bitbucket.org/pypy/pypy/changeset/cdb51e95efd2/
Log: move some code arround to avoid swallowing unwanted exceptions.
diff --git a/pypy/jit/metainterp/optimizeopt/rewrite.py
b/pypy/jit/metainterp/optimizeopt/rewrite.py
--- a/pypy/jit/metainterp/optimizeopt/rewrite.py
+++ b/pypy/jit/metainterp/optimizeopt/rewrite.py
@@ -49,32 +49,35 @@
def find_rewritable_bool(self, op, args):
try:
oldopnum = opboolinvers[op.getopnum()]
+ except KeyError:
+ pass
+ else:
targs = self.optimizer.make_args_key(ResOperation(oldopnum,
[args[0], args[1]],
None))
if self.try_boolinvers(op, targs):
return True
- except KeyError:
- pass
try:
oldopnum = opboolreflex[op.getopnum()] # FIXME: add INT_ADD,
INT_MUL
+ except KeyError:
+ pass
+ else:
targs = self.optimizer.make_args_key(ResOperation(oldopnum,
[args[1], args[0]],
None))
oldop = self.get_pure_result(targs)
if oldop is not None and oldop.getdescr() is op.getdescr():
self.make_equal_to(op.result, self.getvalue(oldop.result))
return True
- except KeyError:
- pass
try:
oldopnum = opboolinvers[opboolreflex[op.getopnum()]]
+ except KeyError:
+ pass
+ else:
targs = self.optimizer.make_args_key(ResOperation(oldopnum,
[args[1], args[0]],
None))
if self.try_boolinvers(op, targs):
return True
- except KeyError:
- pass
return False
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
