[pypy-commit] pypy win64-stage1: small merge glitch with big effect
ctismer
noreply at buildbot.pypy.org
Wed Nov 23 03:32:47 CET 2011
Author: Christian Tismer <tismer at stackless.com>
Branch: win64-stage1
Changeset: r49676:87a8294d2a9c
Date: 2011-11-22 20:36 +0100
http://bitbucket.org/pypy/pypy/changeset/87a8294d2a9c/
Log: small merge glitch with big effect
diff --git a/pypy/jit/metainterp/history.py b/pypy/jit/metainterp/history.py
--- a/pypy/jit/metainterp/history.py
+++ b/pypy/jit/metainterp/history.py
@@ -268,7 +268,6 @@
def __init__(self, value):
if not we_are_translated():
- if isinstance(value, int):
if isinstance(value, (int, long)):
value = int(value) # bool -> int
else:
More information about the pypy-commit
mailing list