Author: Ronan Lamy <ronan.l...@gmail.com> Branch: py3.5 Changeset: r93230:c932756506d4 Date: 2017-12-01 02:26 +0000 http://bitbucket.org/pypy/pypy/changeset/c932756506d4/
Log: hg merge default diff --git a/rpython/jit/metainterp/optimizeopt/intutils.py b/rpython/jit/metainterp/optimizeopt/intutils.py --- a/rpython/jit/metainterp/optimizeopt/intutils.py +++ b/rpython/jit/metainterp/optimizeopt/intutils.py @@ -273,7 +273,8 @@ return r def contains(self, val): - assert not isinstance(val, long) + if not we_are_translated(): + assert not isinstance(val, long) if not isinstance(val, int): if ((not self.has_lower or self.lower == MININT) and not self.has_upper or self.upper == MAXINT): _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit