Author: Armin Rigo <ar...@tunes.org> Branch: py3.5 Changeset: r88648:bf57a8b4e6fd Date: 2016-11-24 22:42 +0100 http://bitbucket.org/pypy/pypy/changeset/bf57a8b4e6fd/
Log: hg merge default diff --git a/rpython/rlib/jit.py b/rpython/rlib/jit.py --- a/rpython/rlib/jit.py +++ b/rpython/rlib/jit.py @@ -1191,7 +1191,7 @@ else: if condition: function(*args) -conditional_call._always_inline_ = True +conditional_call._always_inline_ = 'try' def _jit_conditional_call_value(value, function, *args): return value # special-cased below @@ -1233,7 +1233,7 @@ value = function(*args) assert not isinstance(value, int) return value -conditional_call_elidable._always_inline_ = True +conditional_call_elidable._always_inline_ = 'try' class ConditionalCallEntry(ExtRegistryEntry): _about_ = _jit_conditional_call, _jit_conditional_call_value _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit