Author: Carl Friedrich Bolz <cfb...@gmx.de>
Branch: getarrayitem-into-bridges
Changeset: r92041:a9a9281dad98
Date: 2017-08-02 17:31 +0200
http://bitbucket.org/pypy/pypy/changeset/a9a9281dad98/
Log: fix affected tests
diff --git a/rpython/jit/metainterp/optimizeopt/heap.py
b/rpython/jit/metainterp/optimizeopt/heap.py
--- a/rpython/jit/metainterp/optimizeopt/heap.py
+++ b/rpython/jit/metainterp/optimizeopt/heap.py
@@ -735,15 +735,14 @@
structinfo = info.InstancePtrInfo(parent_descr)
structinfo.init_fields(parent_descr, descr.get_index())
box1.set_forwarded(structinfo)
-
cf = self.field_cache(descr)
structinfo.setfield(descr, box1, box2, optheap=self, cf=cf)
+
for box1, index, descr, box2 in triples_array:
arrayinfo = box1.get_forwarded()
if not isinstance(arrayinfo, info.AbstractVirtualPtrInfo):
arrayinfo = info.ArrayPtrInfo(descr)
box1.set_forwarded(arrayinfo)
-
cf = self.arrayitem_cache(descr, index)
arrayinfo.setitem(descr, index, box1, box2, optheap=self, cf=cf)
diff --git a/rpython/jit/metainterp/test/test_bridgeopt.py
b/rpython/jit/metainterp/test/test_bridgeopt.py
--- a/rpython/jit/metainterp/test/test_bridgeopt.py
+++ b/rpython/jit/metainterp/test/test_bridgeopt.py
@@ -61,7 +61,7 @@
serialize_optimizer_knowledge(optimizer, numb_state, liveboxes, {}, None)
- assert unpack_numbering(numb_state.create_numbering()) == [1, 0b010000, 0]
+ assert unpack_numbering(numb_state.create_numbering()) == [1, 0b010000, 0,
0]
rbox1 = InputArgRef()
rbox2 = InputArgRef()
@@ -97,7 +97,7 @@
serialize_optimizer_knowledge(optimizer, numb_state, liveboxes, {}, None)
- assert len(numb_state.create_numbering().code) == 2 +
math.ceil(len(refboxes) / 6.0)
+ assert len(numb_state.create_numbering().code) == 3 +
math.ceil(len(refboxes) / 6.0)
dct = {box: cls
for box, known_class in boxes_known_classes
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
