Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r88710:43ec8832c98f
Date: 2016-11-28 18:32 +0100
http://bitbucket.org/pypy/pypy/changeset/43ec8832c98f/
Log: Fix for test_sysmodule
diff --git a/rpython/rlib/jit.py b/rpython/rlib/jit.py
--- a/rpython/rlib/jit.py
+++ b/rpython/rlib/jit.py
@@ -3,7 +3,7 @@
import py
from rpython.rlib.nonconst import NonConstant
-from rpython.rlib.objectmodel import CDefinedIntSymbolic,
keepalive_until_here, specialize, not_rpython
+from rpython.rlib.objectmodel import CDefinedIntSymbolic,
keepalive_until_here, specialize, not_rpython, we_are_translated
from rpython.rlib.unroll import unrolling_iterable
from rpython.rtyper.extregistry import ExtRegistryEntry
from rpython.tool.sourcetools import rpython_wrapper
@@ -1221,7 +1221,8 @@
x = jit.conditional_call_elidable(self.cache, _compute_and_cache, ...)
"""
- if we_are_jitted():
+ if we_are_translated() and we_are_jitted():
+ #^^^ the occasional test patches we_are_jitted() to True
return _jit_conditional_call_value(value, function, *args)
else:
if isinstance(value, int):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
