Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r80092:ef6fa2082f08
Date: 2015-10-09 16:11 +0100
http://bitbucket.org/pypy/pypy/changeset/ef6fa2082f08/
Log: Translation fix
diff --git a/pypy/module/_cffi_backend/ccallback.py
b/pypy/module/_cffi_backend/ccallback.py
--- a/pypy/module/_cffi_backend/ccallback.py
+++ b/pypy/module/_cffi_backend/ccallback.py
@@ -206,10 +206,10 @@
return 'cffi_callback <?>'
return 'cffi_callback ' + key_pycode.get_repr()
-jitdriver = JitDriver(name='cffi_callback',
- greens=['callback.key_pycode'],
- reds=['callback', 'll_res', 'll_args'],
- get_printable_location=get_printable_location)
+jitdriver = jit.JitDriver(name='cffi_callback',
+ greens=['callback.key_pycode'],
+ reds=['ll_res', 'll_args', 'callback'],
+ get_printable_location=get_printable_location)
def py_invoke_callback(callback, ll_res, ll_args):
jitdriver.jit_merge_point(callback=callback, ll_res=ll_res,
ll_args=ll_args)
diff --git a/pypy/objspace/fake/objspace.py b/pypy/objspace/fake/objspace.py
--- a/pypy/objspace/fake/objspace.py
+++ b/pypy/objspace/fake/objspace.py
@@ -318,6 +318,9 @@
def unicode_from_object(self, w_obj):
return w_some_obj()
+ def _try_fetch_pycode(self, w_func):
+ return None
+
# ----------
def translates(self, func=None, argtypes=None, seeobj_w=[], **kwds):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
