Author: Armin Rigo <[email protected]>
Branch:
Changeset: r80604:2e371c1bb8f8
Date: 2015-11-09 08:46 +0100
http://bitbucket.org/pypy/pypy/changeset/2e371c1bb8f8/
Log: fix test
diff --git a/rpython/jit/backend/llsupport/descr.py
b/rpython/jit/backend/llsupport/descr.py
--- a/rpython/jit/backend/llsupport/descr.py
+++ b/rpython/jit/backend/llsupport/descr.py
@@ -41,11 +41,11 @@
def __init__(self, size, gc_fielddescrs=None, all_fielddescrs=None,
vtable=lltype.nullptr(rclass.OBJECT_VTABLE),
immutable_flag=False):
+ assert lltype.typeOf(vtable) == lltype.Ptr(rclass.OBJECT_VTABLE)
self.size = size
self.gc_fielddescrs = gc_fielddescrs
self.all_fielddescrs = all_fielddescrs
self.vtable = vtable
- assert vtable is not None
self.immutable_flag = immutable_flag
def get_all_fielddescrs(self):
diff --git a/rpython/jit/backend/llsupport/test/test_zrpy_gc_direct.py
b/rpython/jit/backend/llsupport/test/test_zrpy_gc_direct.py
--- a/rpython/jit/backend/llsupport/test/test_zrpy_gc_direct.py
+++ b/rpython/jit/backend/llsupport/test/test_zrpy_gc_direct.py
@@ -34,8 +34,8 @@
rclass = getclassrepr(rtyper, classdef)
rinstance = getinstancerepr(rtyper, classdef)
LLB = rinstance.lowleveltype.TO
- vtable_B = rclass.getvtable()
- adr_vtable_B = llmemory.cast_ptr_to_adr(vtable_B)
+ ptr_vtable_B = rclass.getvtable()
+ adr_vtable_B = llmemory.cast_ptr_to_adr(ptr_vtable_B)
vtable_B = llmemory.cast_adr_to_int(adr_vtable_B, mode="symbolic")
CPU = getcpuclass()
@@ -46,7 +46,7 @@
finaldescr = BasicFinalDescr()
faildescr = BasicFailDescr()
- descr_B = cpu.sizeof(LLB, vtable_B)
+ descr_B = cpu.sizeof(LLB, ptr_vtable_B)
typeid_B = descr_B.get_type_id()
loop1 = parse("""
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
