Author: Maciej Fijalkowski <fij...@gmail.com> Branch: share-guard-info Changeset: r79895:50ba44e6ef57 Date: 2015-09-29 15:26 +0200 http://bitbucket.org/pypy/pypy/changeset/50ba44e6ef57/
Log: follow through enter_portal_frame, since it's ok nowadays diff --git a/rpython/jit/metainterp/optimizeopt/optimizer.py b/rpython/jit/metainterp/optimizeopt/optimizer.py --- a/rpython/jit/metainterp/optimizeopt/optimizer.py +++ b/rpython/jit/metainterp/optimizeopt/optimizer.py @@ -582,12 +582,7 @@ elif op.can_raise(): self.exception_might_have_happened = True if ((op.has_no_side_effect() or op.is_guard() or op.is_jit_debug() or - op.is_ovf()) and - not self.is_call_pure_pure_canraise(op) and - not op.getopnum() == rop.ENTER_PORTAL_FRAME): - # we can't share across ENTER_PORTAL_FRAME because if we later - # change the decision of inlining into that portal frame, we - # won't follow the same path through blackhole + op.is_ovf()) and not self.is_call_pure_pure_canraise(op)): pass else: self._last_guard_op = None _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit