Author: Antonio Cuni <[email protected]>
Branch: x86-dump-labels
Changeset: r44140:f810b7dab76e
Date: 2011-05-13 17:36 +0200
http://bitbucket.org/pypy/pypy/changeset/f810b7dab76e/
Log: fix test due to 34fe5f5bf59b
diff --git a/pypy/jit/backend/llsupport/test/test_gc.py
b/pypy/jit/backend/llsupport/test/test_gc.py
--- a/pypy/jit/backend/llsupport/test/test_gc.py
+++ b/pypy/jit/backend/llsupport/test/test_gc.py
@@ -413,7 +413,7 @@
ResOperation(rop.DEBUG_MERGE_POINT, ['dummy', 2], None),
]
gc_ll_descr = self.gc_ll_descr
- gc_ll_descr.rewrite_assembler(None, operations)
+ operations = gc_ll_descr.rewrite_assembler(None, operations)
assert len(operations) == 0
def test_rewrite_assembler_1(self):
@@ -437,7 +437,7 @@
]
gc_ll_descr = self.gc_ll_descr
gc_ll_descr.gcrefs = MyFakeGCRefList()
- gc_ll_descr.rewrite_assembler(MyFakeCPU(), operations)
+ operations = gc_ll_descr.rewrite_assembler(MyFakeCPU(), operations)
assert len(operations) == 2
assert operations[0].getopnum() == rop.GETFIELD_RAW
assert operations[0].getarg(0) == ConstInt(43)
@@ -474,7 +474,7 @@
old_can_move = rgc.can_move
try:
rgc.can_move = lambda s: False
- gc_ll_descr.rewrite_assembler(MyFakeCPU(), operations)
+ operations = gc_ll_descr.rewrite_assembler(MyFakeCPU(), operations)
finally:
rgc.can_move = old_can_move
assert len(operations) == 1
@@ -496,7 +496,7 @@
descr=field_descr),
]
gc_ll_descr = self.gc_ll_descr
- gc_ll_descr.rewrite_assembler(self.fake_cpu, operations)
+ operations = gc_ll_descr.rewrite_assembler(self.fake_cpu, operations)
assert len(operations) == 2
#
assert operations[0].getopnum() == rop.COND_CALL_GC_WB
@@ -520,7 +520,7 @@
descr=array_descr),
]
gc_ll_descr = self.gc_ll_descr
- gc_ll_descr.rewrite_assembler(self.fake_cpu, operations)
+ operations = gc_ll_descr.rewrite_assembler(self.fake_cpu, operations)
assert len(operations) == 2
#
assert operations[0].getopnum() == rop.COND_CALL_GC_WB
@@ -552,8 +552,8 @@
setfield_gc(p0, p1, descr=xdescr)
jump()
""", namespace=locals())
- self.gc_ll_descr.rewrite_assembler(self.fake_cpu, ops.operations)
- equaloplists(ops.operations, expected.operations)
+ operations = self.gc_ll_descr.rewrite_assembler(self.fake_cpu,
ops.operations)
+ equaloplists(operations, expected.operations)
def test_rewrite_assembler_initialization_store_2(self):
S = lltype.GcStruct('S', ('parent', OBJECT),
@@ -576,8 +576,8 @@
setfield_raw(p0, p1, descr=xdescr)
jump()
""", namespace=locals())
- self.gc_ll_descr.rewrite_assembler(self.fake_cpu, ops.operations)
- equaloplists(ops.operations, expected.operations)
+ operations = self.gc_ll_descr.rewrite_assembler(self.fake_cpu,
ops.operations)
+ equaloplists(operations, expected.operations)
def test_rewrite_assembler_initialization_store_3(self):
A = lltype.GcArray(lltype.Ptr(lltype.GcStruct('S')))
@@ -594,8 +594,8 @@
setarrayitem_gc(p0, 0, p1, descr=arraydescr)
jump()
""", namespace=locals())
- self.gc_ll_descr.rewrite_assembler(self.fake_cpu, ops.operations)
- equaloplists(ops.operations, expected.operations)
+ operations = self.gc_ll_descr.rewrite_assembler(self.fake_cpu,
ops.operations)
+ equaloplists(operations, expected.operations)
class TestFrameworkMiniMark(TestFramework):
gc = 'minimark'
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
