Author: Maciej Fijalkowski <[email protected]>
Branch: optresult
Changeset: r77612:c66e4c9a78e0
Date: 2015-05-27 10:02 +0200
http://bitbucket.org/pypy/pypy/changeset/c66e4c9a78e0/
Log: fix the last problem
diff --git a/rpython/jit/metainterp/history.py
b/rpython/jit/metainterp/history.py
--- a/rpython/jit/metainterp/history.py
+++ b/rpython/jit/metainterp/history.py
@@ -671,8 +671,7 @@
@staticmethod
def check_consistency_of(inputargs, operations):
for box in inputargs:
- assert (not isinstance(box, Const),
- "Loop.inputargs contains %r" % (box,))
+ assert not isinstance(box, Const), "Loop.inputargs contains %r" %
(box,)
seen = dict.fromkeys(inputargs)
assert len(seen) == len(inputargs), (
"duplicate Box in the Loop.inputargs")
diff --git a/rpython/jit/metainterp/optimizeopt/vstring.py
b/rpython/jit/metainterp/optimizeopt/vstring.py
--- a/rpython/jit/metainterp/optimizeopt/vstring.py
+++ b/rpython/jit/metainterp/optimizeopt/vstring.py
@@ -386,7 +386,7 @@
if lgt.is_constant() and lgt.getint() <= M:
# up to M characters are done "inline", i.e. with STRGETITEM/STRSETITEM
# instead of just a COPYSTRCONTENT.
- for i in range(lengthbox.getint()):
+ for i in range(lgt.getint()):
charbox = _strgetitem(string_optimizer, srcbox, srcoffsetbox, mode)
srcoffsetbox = _int_add(string_optimizer, srcoffsetbox, CONST_1)
assert not isinstance(targetbox, Const)# ConstPtr never makes sense
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
