Author: Alex Gaynor <[email protected]>
Branch: kill-someobject
Changeset: r57830:dc0452a0abcd
Date: 2012-10-07 18:38 +0200
http://bitbucket.org/pypy/pypy/changeset/dc0452a0abcd/
Log: Make jit/codewriter tests up to date with the new APIs
diff --git a/pypy/jit/codewriter/call.py b/pypy/jit/codewriter/call.py
--- a/pypy/jit/codewriter/call.py
+++ b/pypy/jit/codewriter/call.py
@@ -180,11 +180,8 @@
"""
fnptr = self.rtyper.type_system.getcallable(graph)
FUNC = get_functype(lltype.typeOf(fnptr))
- assert lltype.Ptr(lltype.PyObject) not in FUNC.ARGS
- if self.rtyper.type_system.name == 'ootypesystem':
- XXX
- else:
- fnaddr = llmemory.cast_ptr_to_adr(fnptr)
+ assert self.rtyper.type_system.name == "lltypesystem"
+ fnaddr = llmemory.cast_ptr_to_adr(fnptr)
NON_VOID_ARGS = [ARG for ARG in FUNC.ARGS if ARG is not lltype.Void]
calldescr = self.cpu.calldescrof(FUNC, tuple(NON_VOID_ARGS),
FUNC.RESULT, EffectInfo.MOST_GENERAL)
diff --git a/pypy/rlib/jit.py b/pypy/rlib/jit.py
--- a/pypy/rlib/jit.py
+++ b/pypy/rlib/jit.py
@@ -641,11 +641,7 @@
self.bookkeeper._jit_annotation_cache[driver] = cache
for key, s_value in kwds_s.items():
s_previous = cache.get(key, annmodel.s_ImpossibleValue)
- s_value = annmodel.unionof(s_previous, s_value)
- if annmodel.isdegenerated(s_value):
- raise JitHintError("mixing incompatible types in argument %s"
- " of jit_merge_point/can_enter_jit" %
- key[2:])
+ s_value = annmodel.unionof(s_previous, s_value) # where="mixing
incompatible types in argument %s of jit_merge_point/can_enter_jit" % key[2:]
cache[key] = s_value
# add the attribute _dont_reach_me_in_del_ (see pypy.rpython.rclass)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
