[pypy-commit] pypy optresult-unroll: whack at tests

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: optresult-unroll
Changeset: r79513:eab1d6e2c45b
Date: 2015-09-07 23:17 +0200
http://bitbucket.org/pypy/pypy/changeset/eab1d6e2c45b/

Log:	whack at tests

diff --git a/rpython/jit/backend/llgraph/runner.py b/rpython/jit/backend/llgraph/runner.py
--- a/rpython/jit/backend/llgraph/runner.py
+++ b/rpython/jit/backend/llgraph/runner.py
@@ -434,7 +434,7 @@
             self.descrs[key] = descr
             return descr
 
-    def sizeof(self, S, vtable):
+    def sizeof(self, S, vtable=lltype.nullptr(rclass.OBJECT_VTABLE)):
         key = ('size', S)
         try:
             descr = self.descrs[key]
diff --git a/rpython/jit/backend/llsupport/llmodel.py b/rpython/jit/backend/llsupport/llmodel.py
--- a/rpython/jit/backend/llsupport/llmodel.py
+++ b/rpython/jit/backend/llsupport/llmodel.py
@@ -324,7 +324,7 @@
     def cast_int_to_ptr(self, x, TYPE):
         return rffi.cast(TYPE, x)
 
-    def sizeof(self, S, vtable):
+    def sizeof(self, S, vtable=lltype.nullptr(rclass.OBJECT_VTABLE)):
         return get_size_descr(self.gc_ll_descr, S, vtable)
 
     def fielddescrof(self, STRUCT, fieldname):
diff --git a/rpython/jit/backend/llsupport/test/test_descr.py b/rpython/jit/backend/llsupport/test/test_descr.py
--- a/rpython/jit/backend/llsupport/test/test_descr.py
+++ b/rpython/jit/backend/llsupport/test/test_descr.py
@@ -13,24 +13,24 @@
     T = lltype.GcStruct('T')
     S = lltype.GcStruct('S', ('x', lltype.Char),
                              ('y', lltype.Ptr(T)))
-    descr_s = get_size_descr(c0, S, None)
-    descr_t = get_size_descr(c0, T, None)
+    descr_s = get_size_descr(c0, S)
+    descr_t = get_size_descr(c0, T)
     assert descr_s.size == symbolic.get_size(S, False)
     assert descr_t.size == symbolic.get_size(T, False)
     assert descr_s.is_immutable() == False
     assert descr_t.is_immutable() == False
     assert descr_t.gc_fielddescrs == []
     assert len(descr_s.gc_fielddescrs) == 1
-    assert descr_s == get_size_descr(c0, S, None)
-    assert descr_s != get_size_descr(c1, S, None)
+    assert descr_s == get_size_descr(c0, S)
+    assert descr_s != get_size_descr(c1, S)
     #
-    descr_s = get_size_descr(c1, S, None)
+    descr_s = get_size_descr(c1, S)
     assert isinstance(descr_s.size, Symbolic)
     assert descr_s.is_immutable() == False
 
     PARENT = lltype.Struct('P', ('x', lltype.Ptr(T)))
     STRUCT = lltype.GcStruct('S', ('parent', PARENT), ('y', lltype.Ptr(T)))
-    descr_struct = get_size_descr(c0, STRUCT, None)
+    descr_struct = get_size_descr(c0, STRUCT)
     assert len(descr_struct.gc_fielddescrs) == 2
 
 def test_get_size_descr_immut():
@@ -49,7 +49,7 @@
     for STRUCT in [S, T, U, V]:
         for translated in [False, True]:
             c0 = GcCache(translated)
-            descr_s = get_size_descr(c0, STRUCT, None)
+            descr_s = get_size_descr(c0, STRUCT)
             assert descr_s.is_immutable() == True
 
 def test_get_field_descr():
@@ -329,7 +329,7 @@
     S = lltype.GcStruct('S', ('x', lltype.Char),
                              ('y', lltype.Ptr(T)),
                              ('z', lltype.Ptr(T)))
-    descr1 = get_size_descr(c0, S, None)
+    descr1 = get_size_descr(c0, S)
     s = symbolic.get_size(S, False)
     assert repr_of_descr(descr1) == '<SizeDescr %d>' % s
     #
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
@@ -1808,7 +1808,7 @@
             vtable_for_T = lltype.malloc(self.MY_VTABLE, immortal=True)
             vtable_for_T_addr = llmemory.cast_ptr_to_adr(vtable_for_T)
         else:
-            vtable_for_T = None
+            vtable_for_T = lltype.nullptr(rclass.OBJECT_VTABLE)
         cpu = self.cpu
         class FakeGCCache(object):
             pass
@@ -1831,7 +1831,7 @@
             t.parent.parent.parent.typeptr = vtable_for_T
         t_box = InputArgRef(lltype.cast_opaque_ptr(llmemory.GCREF, t))
         if not hasattr(T, 'parent'):
-            vtable = None
+            vtable = lltype.nullptr(rclass.OBJECT_VTABLE)
             T_box = None
         else:
             vtable = vtable_for_T
@@ -1934,7 +1934,7 @@
     def test_new_plain_struct(self):
         cpu = self.cpu
         S = lltype.GcStruct('S', ('x', lltype.Char), ('y', lltype.Char))
-        sizedescr = cpu.sizeof(S, None)
+        sizedescr = cpu.sizeof(S)
         r1 = self.execute_operation(rop.NEW, [], 'ref', descr=sizedescr)
         r2 = self.execute_operation(rop.NEW, [], 'ref', descr=sizedescr)
         assert r1 != r2
@@ -3463,7 +3463,7 @@
         #    descrfld_ry)
         #assert rs.y == a
         #
-        descrsize = cpu.sizeof(S, None)
+        descrsize = cpu.sizeof(S)
         x = cpu.bh_new(descrsize)
         lltype.cast_opaque_ptr(lltype.Ptr(S), x)    # type check
         #
@@ -4801,8 +4801,8 @@
             py.test.skip("llgraph can't do zero_ptr_field")
         T = lltype.GcStruct('T')
         S = lltype.GcStruct('S', ('x', lltype.Ptr(T)))
-        tdescr = self.cpu.sizeof(T, None)
-        sdescr = self.cpu.sizeof(S, None)
+        tdescr = self.cpu.sizeof(T)
+        sdescr = self.cpu.sizeof(S)
         fielddescr = self.cpu.fielddescrof(S, 'x')
         loop = parse("""
         []