[pypy-commit] pypy jit-cleanup: remove unused argument from test helper
rlamy
pypy.commits at gmail.com
Thu Apr 4 19:55:58 EDT 2019
Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: jit-cleanup
Changeset: r96415:ec67059fa49e
Date: 2019-04-04 17:45 +0100
http://bitbucket.org/pypy/pypy/changeset/ec67059fa49e/
Log: remove unused argument from test helper
diff --git a/rpython/jit/backend/test/test_ll_random.py b/rpython/jit/backend/test/test_ll_random.py
--- a/rpython/jit/backend/test/test_ll_random.py
+++ b/rpython/jit/backend/test/test_ll_random.py
@@ -218,7 +218,7 @@
# ____________________________________________________________
-def ConstAddr(addr, cpu):
+def ConstAddr(addr):
return ConstInt(heaptracker.adr2int(addr))
class GuardClassOperation(test_random.GuardOperation):
@@ -235,7 +235,7 @@
v2, S2 = builder.get_structptr_var(r, must_have_vtable=True)
vtable = S._hints['vtable']._as_ptr()
vtable2 = S2._hints['vtable']._as_ptr()
- c_vtable2 = ConstAddr(llmemory.cast_ptr_to_adr(vtable2), builder.cpu)
+ c_vtable2 = ConstAddr(llmemory.cast_ptr_to_adr(vtable2))
op = ResOperation(self.opnum, [v, c_vtable2], None)
return op, (vtable == vtable2)
@@ -249,8 +249,7 @@
builder.loop.operations.append(op)
v2, S2 = builder.get_structptr_var(r, must_have_vtable=True)
vtable2 = S2._hints['vtable']._as_ptr()
- c_vtable2 = ConstAddr(llmemory.cast_ptr_to_adr(vtable2),
- builder.cpu)
+ c_vtable2 = ConstAddr(llmemory.cast_ptr_to_adr(vtable2))
op = ResOperation(self.opnum, [op, c_vtable2], None)
return op, False
@@ -616,7 +615,7 @@
RES = self.getresulttype()
TP = lltype.FuncType([lltype.Signed] * len(subset), RES)
ptr = llhelper(lltype.Ptr(TP), f)
- c_addr = ConstAddr(llmemory.cast_ptr_to_adr(ptr), builder.cpu)
+ c_addr = ConstAddr(llmemory.cast_ptr_to_adr(ptr))
args = [c_addr] + subset
descr = self.getcalldescr(builder, TP)
self.put(builder, args, descr)
@@ -633,12 +632,12 @@
RES = self.getresulttype()
TP = lltype.FuncType([lltype.Signed] * len(subset), RES)
ptr = llhelper(lltype.Ptr(TP), f)
- c_addr = ConstAddr(llmemory.cast_ptr_to_adr(ptr), builder.cpu)
+ c_addr = ConstAddr(llmemory.cast_ptr_to_adr(ptr))
args = [c_addr] + subset
descr = self.getcalldescr(builder, TP)
self.put(builder, args, descr)
_, vtableptr = builder.get_random_structure_type_and_vtable(r)
- exc_box = ConstAddr(llmemory.cast_ptr_to_adr(vtableptr), builder.cpu)
+ exc_box = ConstAddr(llmemory.cast_ptr_to_adr(vtableptr))
op = ResOperation(rop.GUARD_EXCEPTION, [exc_box],
descr=builder.getfaildescr())
op.setfailargs(builder.subset_of_intvars(r))
@@ -655,11 +654,11 @@
subset, f, exc = self.raising_func_code(builder, r)
TP = lltype.FuncType([lltype.Signed] * len(subset), lltype.Void)
ptr = llhelper(lltype.Ptr(TP), f)
- c_addr = ConstAddr(llmemory.cast_ptr_to_adr(ptr), builder.cpu)
+ c_addr = ConstAddr(llmemory.cast_ptr_to_adr(ptr))
args = [c_addr] + subset
descr = self.getcalldescr(builder, TP)
self.put(builder, args, descr)
- exc_box = ConstAddr(llmemory.cast_ptr_to_adr(exc), builder.cpu)
+ exc_box = ConstAddr(llmemory.cast_ptr_to_adr(exc))
op = ResOperation(rop.GUARD_EXCEPTION, [exc_box],
descr=builder.getfaildescr())
op.setfailargs(fail_subset)
@@ -672,13 +671,13 @@
subset, f, exc = self.raising_func_code(builder, r)
TP = lltype.FuncType([lltype.Signed] * len(subset), lltype.Void)
ptr = llhelper(lltype.Ptr(TP), f)
- c_addr = ConstAddr(llmemory.cast_ptr_to_adr(ptr), builder.cpu)
+ c_addr = ConstAddr(llmemory.cast_ptr_to_adr(ptr))
args = [c_addr] + subset
descr = self.getcalldescr(builder, TP)
self.put(builder, args, descr)
op = ResOperation(rop.GUARD_NO_EXCEPTION, [],
descr=builder.getfaildescr())
- op._exc_box = ConstAddr(llmemory.cast_ptr_to_adr(exc), builder.cpu)
+ op._exc_box = ConstAddr(llmemory.cast_ptr_to_adr(exc))
op.setfailargs(builder.subset_of_intvars(r))
builder.should_fail_by = op
builder.guard_op = op
@@ -691,7 +690,7 @@
subset, f, exc = self.raising_func_code(builder, r)
TP = lltype.FuncType([lltype.Signed] * len(subset), lltype.Void)
ptr = llhelper(lltype.Ptr(TP), f)
- c_addr = ConstAddr(llmemory.cast_ptr_to_adr(ptr), builder.cpu)
+ c_addr = ConstAddr(llmemory.cast_ptr_to_adr(ptr))
args = [c_addr] + subset
descr = self.getcalldescr(builder, TP)
self.put(builder, args, descr)
@@ -699,10 +698,10 @@
_, vtableptr = builder.get_random_structure_type_and_vtable(r)
if vtableptr != exc:
break
- other_box = ConstAddr(llmemory.cast_ptr_to_adr(vtableptr), builder.cpu)
+ other_box = ConstAddr(llmemory.cast_ptr_to_adr(vtableptr))
op = ResOperation(rop.GUARD_EXCEPTION, [other_box],
descr=builder.getfaildescr())
- op._exc_box = ConstAddr(llmemory.cast_ptr_to_adr(exc), builder.cpu)
+ op._exc_box = ConstAddr(llmemory.cast_ptr_to_adr(exc))
op.setfailargs(builder.subset_of_intvars(r))
builder.should_fail_by = op
builder.guard_op = op
@@ -735,7 +734,7 @@
#
TP = lltype.FuncType([lltype.Signed] * len(subset), RESULT_TYPE)
ptr = llhelper(lltype.Ptr(TP), call_me)
- c_addr = ConstAddr(llmemory.cast_ptr_to_adr(ptr), builder.cpu)
+ c_addr = ConstAddr(llmemory.cast_ptr_to_adr(ptr))
args = [v_cond, c_addr] + subset
descr = self.getcalldescr(builder, TP)
self.put(builder, args, descr)
diff --git a/rpython/jit/metainterp/test/test_resume.py b/rpython/jit/metainterp/test/test_resume.py
--- a/rpython/jit/metainterp/test/test_resume.py
+++ b/rpython/jit/metainterp/test/test_resume.py
@@ -638,12 +638,12 @@
pass
fakeoptimizer = FakeOptimizer_VirtualValue()
-def ConstAddr(addr, cpu): # compatibility
+def ConstAddr(addr): # compatibility
return ConstInt(heaptracker.adr2int(addr))
def virtual_value(keybox, value, next):
- vv = VirtualValue(fakeoptimizer, ConstAddr(LLtypeMixin.node_vtable_adr,
- LLtypeMixin.cpu), keybox)
+ vv = VirtualValue(
+ fakeoptimizer, ConstAddr(LLtypeMixin.node_vtable_adr), keybox)
if not isinstance(next, OptValue):
next = OptValue(next)
vv.setfield(LLtypeMixin.valuedescr, OptValue(value))
@@ -1212,13 +1212,13 @@
modifier.vfieldboxes = {}
vdescr = LLtypeMixin.nodesize2
- ca = ConstAddr(LLtypeMixin.node_vtable_adr2, LLtypeMixin.cpu)
+ ca = ConstAddr(LLtypeMixin.node_vtable_adr2)
v4 = info.InstancePtrInfo(vdescr, ca, True)
b4s.set_forwarded(v4)
v4.setfield(LLtypeMixin.nextdescr, ca, b2s)
v4.setfield(LLtypeMixin.valuedescr, ca, b3s)
v4.setfield(LLtypeMixin.otherdescr, ca, b5s)
- ca = ConstAddr(LLtypeMixin.node_vtable_adr, LLtypeMixin.cpu)
+ ca = ConstAddr(LLtypeMixin.node_vtable_adr)
v2 = info.InstancePtrInfo(LLtypeMixin.nodesize, ca, True)
v2.setfield(LLtypeMixin.nextdescr, b4s, ca)
v2.setfield(LLtypeMixin.valuedescr, c1s, ca)
More information about the pypy-commit
mailing list