Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: optresult-unroll
Changeset: r79251:179bcf4602f2
Date: 2015-08-27 13:01 +0200
http://bitbucket.org/pypy/pypy/changeset/179bcf4602f2/
Log: fix
diff --git a/rpython/jit/metainterp/optimizeopt/unroll.py
b/rpython/jit/metainterp/optimizeopt/unroll.py
--- a/rpython/jit/metainterp/optimizeopt/unroll.py
+++ b/rpython/jit/metainterp/optimizeopt/unroll.py
@@ -52,11 +52,11 @@
self.make_constant_class(op, known_class, False)
if isinstance(preamble_info, info.ArrayPtrInfo):
arr_info = info.ArrayPtrInfo(preamble_info.arraydescr)
- arr_info.lenbound = preamble_info.getlenbound(None)
+ arr_info.lenbound = preamble_info.getlenbound(None).clone()
op.set_forwarded(arr_info)
if isinstance(preamble_info, StrPtrInfo):
str_info = StrPtrInfo(preamble_info.mode)
- str_info.lenbound = preamble_info.getlenbound(None)
+ str_info.lenbound = preamble_info.getlenbound(None).clone()
op.set_forwarded(str_info)
if preamble_info.is_nonnull():
self.make_nonnull(op)
diff --git a/rpython/jit/metainterp/test/test_string.py
b/rpython/jit/metainterp/test/test_string.py
--- a/rpython/jit/metainterp/test/test_string.py
+++ b/rpython/jit/metainterp/test/test_string.py
@@ -147,7 +147,7 @@
self.meta_interp(f, [6, 7])
self.check_resops(newstr=0, strsetitem=0,
newunicode=0, unicodesetitem=0,
- call=0, call_pure=0)
+ call_i=0, call_pure_i=0, call_r=0, call_pure_r=0)
def test_strconcat_escape_str_str(self):
_str = self._str
@@ -870,8 +870,8 @@
class TestLLtype(StringTests, LLJitMixin):
- CALL = "call"
- CALL_PURE = "call_pure"
+ CALL = "call_i"
+ CALL_PURE = "call_pure_i"
class TestLLtypeUnicode(TestLLtype):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
