Author: Ronan Lamy <[email protected]>
Branch: ClassRepr
Changeset: r73955:e53ed98b8062
Date: 2014-10-14 19:58 +0100
http://bitbucket.org/pypy/pypy/changeset/e53ed98b8062/
Log: fix imports
diff --git a/rpython/jit/codewriter/test/test_flatten.py
b/rpython/jit/codewriter/test/test_flatten.py
--- a/rpython/jit/codewriter/test/test_flatten.py
+++ b/rpython/jit/codewriter/test/test_flatten.py
@@ -6,7 +6,8 @@
from rpython.jit.codewriter import longlong
from rpython.jit.codewriter.effectinfo import EffectInfo
from rpython.jit.metainterp.history import AbstractDescr
-from rpython.rtyper.lltypesystem import lltype, rclass, rstr, rffi
+from rpython.rtyper.lltypesystem import lltype, rstr, rffi
+from rpython.rtyper import rclass
from rpython.flowspace.model import SpaceOperation, Variable, Constant
from rpython.translator.unsimplify import varoftype
from rpython.rlib.rarithmetic import ovfcheck, r_uint, r_longlong, r_ulonglong
diff --git a/rpython/jit/codewriter/test/test_jtransform.py
b/rpython/jit/codewriter/test/test_jtransform.py
--- a/rpython/jit/codewriter/test/test_jtransform.py
+++ b/rpython/jit/codewriter/test/test_jtransform.py
@@ -1347,7 +1347,7 @@
assert op2 is None
def test_threadlocalref_get():
- from rpython.rtyper.lltypesystem import rclass
+ from rpython.rtyper import rclass
from rpython.rlib.rthread import ThreadLocalReference
OS_THREADLOCALREF_GET = effectinfo.EffectInfo.OS_THREADLOCALREF_GET
class Foo: pass
diff --git a/rpython/rlib/rgc.py b/rpython/rlib/rgc.py
--- a/rpython/rlib/rgc.py
+++ b/rpython/rlib/rgc.py
@@ -402,14 +402,13 @@
# 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.rclass import OBJECTPTR
+ from rpython.rtyper.rclass import OBJECTPTR, ll_isinstance
from rpython.rtyper.annlowlevel import cast_base_ptr_to_instance
- from rpython.rtyper import rclass
if _is_rpy_instance(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):
+ if ll_isinstance(objptr, clsptr):
return cast_base_ptr_to_instance(Class, objptr)
return None
else:
@@ -500,21 +499,20 @@
_about_ = _get_llcls_from_cls
def compute_result_annotation(self, s_Class):
from rpython.rtyper.llannotation import SomePtr
- from rpython.rtyper.lltypesystem import rclass
+ from rpython.rtyper.rclass import CLASSTYPE
assert s_Class.is_constant()
- return SomePtr(rclass.CLASSTYPE)
+ return SomePtr(CLASSTYPE)
def specialize_call(self, hop):
- from rpython.rtyper.rclass import getclassrepr
+ from rpython.rtyper.rclass import getclassrepr, CLASSTYPE
from rpython.flowspace.model import Constant
- from rpython.rtyper.lltypesystem import rclass
Class = hop.args_s[0].const
classdef = hop.rtyper.annotator.bookkeeper.getuniqueclassdef(Class)
classrepr = getclassrepr(hop.rtyper, classdef)
vtable = classrepr.getvtable()
- assert lltype.typeOf(vtable) == rclass.CLASSTYPE
+ assert lltype.typeOf(vtable) == CLASSTYPE
hop.exception_cannot_occur()
- return Constant(vtable, concretetype=rclass.CLASSTYPE)
+ return Constant(vtable, concretetype=CLASSTYPE)
class Entry(ExtRegistryEntry):
_about_ = dump_rpy_heap
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
