Ronan Lamy  committed 798cea3

fix missing annlowlevel.base_ptr_lltype

  • Participants
  • Parent commits e88f8ea
  • Branches kill-ootype

Comments (0)

Files changed (2)

File rpython/jit/metainterp/

     debug_stop, debug_print)
 from rpython.rtyper import annlowlevel
 from rpython.rtyper.lltypesystem import lltype, llmemory, rffi, rstr
+from rpython.rtyper.lltypesystem.rclass import OBJECTPTR
 # Logic to encode the chain of frames and the state of the boxes at a
 PENDINGFIELDSTRUCT = lltype.Struct('PendingField',
-                                   ('lldescr', annlowlevel.base_ptr_lltype()),
+                                   ('lldescr', OBJECTPTR),
                                    ('num', rffi.SHORT),
                                    ('fieldnum', rffi.SHORT),
                                    ('itemindex', rffi.INT))
 class VRawBufferStateInfo(AbstractVirtualInfo):
     kind = INT
     is_about_raw = True
     def __init__(self, size, offsets, descrs):
         self.size = size
         self.offsets = offsets

File rpython/rlib/

     # Before translation, unwraps the RPython instance contained in a _GcRef.
     # After translation, it is a type-check performed by the GC.
     if we_are_translated():
-        from rpython.rtyper.annlowlevel import base_ptr_lltype
+        from rpython.rtyper.lltypesystem.rclass import OBJECTPTR
         from rpython.rtyper.annlowlevel import cast_base_ptr_to_instance
         from rpython.rtyper.lltypesystem import rclass
         if _is_rpy_instance(gcref):
-            objptr = lltype.cast_opaque_ptr(base_ptr_lltype(), gcref)
+            objptr = lltype.cast_opaque_ptr(OBJECTPTR, gcref)
             if objptr.typeptr:   # may be NULL, e.g. in rdict's dummykeyobj
                 clsptr = _get_llcls_from_cls(Class)
                 if rclass.ll_isinstance(objptr, clsptr):