Author: Brian Kearns <bdkea...@gmail.com>
Branch:
Changeset: r70005:0e26ea0abf69
Date: 2014-03-17 02:45 -0400
http://bitbucket.org/pypy/pypy/changeset/0e26ea0abf69/
Log: cleanup
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py
b/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py
@@ -605,9 +605,9 @@
i1 = ptr_eq(p0, NULL)
guard_false(i1) []
i2 = ptr_ne(NULL, p0)
- guard_true(i0) []
+ guard_true(i2) []
i3 = ptr_eq(NULL, p0)
- guard_false(i1) []
+ guard_false(i3) []
guard_nonnull(p0) []
jump(p0)
"""
@@ -622,6 +622,30 @@
"""
self.optimize_loop(ops, expected, preamble)
+ def test_nonnull_2(self):
+ ops = """
+ []
+ p0 = new_array(5, descr=arraydescr) # forces p0 != NULL
+ i0 = ptr_ne(p0, NULL)
+ guard_true(i0) []
+ i1 = ptr_eq(p0, NULL)
+ guard_false(i1) []
+ i2 = ptr_ne(NULL, p0)
+ guard_true(i2) []
+ i3 = ptr_eq(NULL, p0)
+ guard_false(i3) []
+ guard_nonnull(p0) []
+ escape(p0)
+ jump()
+ """
+ expected = """
+ []
+ p0 = new_array(5, descr=arraydescr)
+ escape(p0)
+ jump()
+ """
+ self.optimize_loop(ops, expected)
+
def test_const_guard_value(self):
ops = """
[]
diff --git a/rpython/jit/metainterp/optimizeopt/virtualize.py
b/rpython/jit/metainterp/optimizeopt/virtualize.py
--- a/rpython/jit/metainterp/optimizeopt/virtualize.py
+++ b/rpython/jit/metainterp/optimizeopt/virtualize.py
@@ -676,7 +676,6 @@
if sizebox is not None:
self.make_varray(op.getdescr(), sizebox.getint(), op.result, op)
else:
- self.getvalue(op.result).ensure_nonnull()
self.emit_operation(op)
def optimize_CALL(self, op):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
