Author: Armin Rigo <[email protected]>
Branch:
Changeset: r66180:3e3517a45321
Date: 2013-08-17 12:02 +0200
http://bitbucket.org/pypy/pypy/changeset/3e3517a45321/
Log: Fix some more tests
diff --git a/rpython/jit/backend/llsupport/test/test_gc.py
b/rpython/jit/backend/llsupport/test/test_gc.py
--- a/rpython/jit/backend/llsupport/test/test_gc.py
+++ b/rpython/jit/backend/llsupport/test/test_gc.py
@@ -202,13 +202,11 @@
rewriter = gc.GcRewriterAssembler(gc_ll_descr, None)
newops = rewriter.newops
v_base = BoxPtr()
- v_value = BoxPtr()
- rewriter.gen_write_barrier(v_base, v_value)
+ rewriter.gen_write_barrier(v_base)
assert llop1.record == []
assert len(newops) == 1
assert newops[0].getopnum() == rop.COND_CALL_GC_WB
assert newops[0].getarg(0) == v_base
- assert newops[0].getarg(1) == v_value
assert newops[0].result is None
wbdescr = newops[0].getdescr()
assert is_valid_int(wbdescr.jit_wb_if_flag)
diff --git a/rpython/jit/backend/test/runner_test.py
b/rpython/jit/backend/test/runner_test.py
--- a/rpython/jit/backend/test/runner_test.py
+++ b/rpython/jit/backend/test/runner_test.py
@@ -2140,11 +2140,9 @@
s = lltype.malloc(S)
s.tid = value
sgcref = lltype.cast_opaque_ptr(llmemory.GCREF, s)
- t = lltype.malloc(S)
- tgcref = lltype.cast_opaque_ptr(llmemory.GCREF, t)
del record[:]
self.execute_operation(rop.COND_CALL_GC_WB,
- [BoxPtr(sgcref), ConstPtr(tgcref)],
+ [BoxPtr(sgcref)],
'void', descr=WriteBarrierDescr())
if cond:
assert record == [rffi.cast(lltype.Signed, sgcref)]
@@ -2179,7 +2177,7 @@
sgcref = lltype.cast_opaque_ptr(llmemory.GCREF, s)
del record[:]
self.execute_operation(rop.COND_CALL_GC_WB_ARRAY,
- [BoxPtr(sgcref), ConstInt(123), BoxPtr(sgcref)],
+ [BoxPtr(sgcref), ConstInt(123)],
'void', descr=WriteBarrierDescr())
if cond:
assert record == [rffi.cast(lltype.Signed, sgcref)]
@@ -2244,7 +2242,7 @@
del record[:]
box_index = BoxIndexCls((9<<7) + 17)
self.execute_operation(rop.COND_CALL_GC_WB_ARRAY,
- [BoxPtr(sgcref), box_index, BoxPtr(sgcref)],
+ [BoxPtr(sgcref), box_index],
'void', descr=WriteBarrierDescr())
if cond in [0, 1]:
assert record == [rffi.cast(lltype.Signed, s.data)]
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
