Author: Maciej Fijalkowski <[email protected]>
Branch: optresult-unroll
Changeset: r78947:d3f41d3f2573
Date: 2015-08-12 18:56 +0200
http://bitbucket.org/pypy/pypy/changeset/d3f41d3f2573/
Log: fix some tests, next stop thinking
diff --git a/rpython/jit/metainterp/optimizeopt/rewrite.py
b/rpython/jit/metainterp/optimizeopt/rewrite.py
--- a/rpython/jit/metainterp/optimizeopt/rewrite.py
+++ b/rpython/jit/metainterp/optimizeopt/rewrite.py
@@ -365,7 +365,8 @@
if realclassbox is not None:
assert realclassbox.same_constant(expectedclassbox)
return
- self.make_constant_class(op.getarg(0), expectedclassbox)
+ self.make_constant_class(op.getarg(0), expectedclassbox,
+ update_last_guard=False)
def optimize_GUARD_CLASS(self, op):
expectedclassbox = op.getarg(1)
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
@@ -7230,7 +7230,7 @@
def test_constant_getfield1(self):
ops = """
[p1, p187, i184]
- p188 = getarrayitem_gc_r(p187, 42, descr=arraydescr)
+ p188 = getarrayitem_gc_r(p187, 42, descr=gcarraydescr)
guard_value(p188, ConstPtr(myptr)) []
p25 = getfield_gc_r(ConstPtr(myptr), descr=otherdescr)
call_n(123, p25, descr=nonwritedescr)
@@ -7238,23 +7238,23 @@
"""
preamble = """
[p1, p187, i184]
- p188 = getarrayitem_gc_r(p187, 42, descr=arraydescr)
+ p188 = getarrayitem_gc_r(p187, 42, descr=gcarraydescr)
guard_value(p188, ConstPtr(myptr)) []
p25 = getfield_gc_r(ConstPtr(myptr), descr=otherdescr)
- p123 = same_as_r(p25)
- jump(p25, p187, i184, p123)
+ call_n(123, p25, descr=nonwritedescr)
+ jump(p25, p187, i184)
"""
short = """
[p1, p187, i184]
- p188 = getarrayitem_gc_r(p187, 42, descr=arraydescr)
- guard_value(p188, ConstPtr(myptr)) []
+ p188 = getarrayitem_gc_r(p187, 42, descr=gcarraydescr)
+ #guard_value(p188, ConstPtr(myptr)) []
p25 = getfield_gc_r(ConstPtr(myptr), descr=otherdescr)
jump(p25)
"""
expected = """
- [p25, p187, i184, p189]
- call_n(123, p189, descr=nonwritedescr)
- jump(p25, p187, i184, p189)
+ [p25, p187, i184]
+ call_n(123, p25, descr=nonwritedescr)
+ jump(p25, p187, i184)
"""
self.optimize_loop(ops, expected, preamble, expected_short=short)
@@ -8507,14 +8507,14 @@
p2 = getfield_gc_r(p1, descr=nextdescr)
mark_opaque_ptr(p2)
guard_class(p2, ConstClass(node_vtable)) []
- i3 = getfield_gc_r(p2, descr=otherdescr)
+ i3 = getfield_gc_i(p2, descr=valuedescr)
i4 = call_i(i3, descr=nonwritedescr)
jump(p1)
"""
expected = """
- [p1, i3]
+ [p1, p2, i3]
i4 = call_i(i3, descr=nonwritedescr)
- jump(p1, i3)
+ jump(p1, p2, i3)
"""
self.optimize_loop(ops, expected)
@@ -8539,13 +8539,13 @@
[p1]
p2 = getfield_gc_r(p1, descr=nextdescr)
mark_opaque_ptr(p2)
- i3 = getfield_gc_i(p2, descr=otherdescr)
+ i3 = getfield_gc_i(p2, descr=valuedescr)
i4 = call_i(i3, descr=nonwritedescr)
jump(p1)
"""
expected = """
[p1, p2]
- i3 = getfield_gc_i(p2, descr=otherdescr)
+ i3 = getfield_gc_i(p2, descr=valuedescr)
i4 = call_i(i3, descr=nonwritedescr)
jump(p1, p2)
"""
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
