Author: Maciej Fijalkowski <[email protected]>
Branch: result-in-resops
Changeset: r58499:66cc988427fe
Date: 2012-10-27 11:59 +0200
http://bitbucket.org/pypy/pypy/changeset/66cc988427fe/
Log: oops
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
@@ -378,7 +378,7 @@
return self._optimize_nullness(op, op.getarg(0), True)
def optimize_INT_IS_ZERO(self, op):
- self._optimize_nullness(op, op.getarg(0), False)
+ return self._optimize_nullness(op, op.getarg(0), False)
def _optimize_oois_ooisnot(self, op, expect_isnot, instance):
value0 = self.getvalue(op.getarg(0))
diff --git a/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py
b/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py
--- a/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py
+++ b/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py
@@ -403,15 +403,15 @@
ops = """
[i0]
i1 = int_is_zero(i0)
- guard_true(i1) []
+ guard_true(i1)
i2 = int_is_true(i0)
- guard_false(i2) []
+ guard_false(i2)
jump(i0)
"""
expected = """
[i0]
i1 = int_is_zero(i0)
- guard_true(i1) []
+ guard_true(i1)
jump(0)
"""
self.optimize_loop(ops, expected)
@@ -419,13 +419,13 @@
def test_ooisnull_oononnull_2(self):
ops = """
[p0]
- guard_nonnull(p0) []
- guard_nonnull(p0) []
+ guard_nonnull(p0)
+ guard_nonnull(p0)
jump(p0)
"""
expected = """
[p0]
- guard_nonnull(p0) []
+ guard_nonnull(p0)
jump(p0)
"""
self.optimize_loop(ops, expected)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
