Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: optresult-unroll
Changeset: r79489:a77eb7711e99
Date: 2015-09-06 22:18 +0200
http://bitbucket.org/pypy/pypy/changeset/a77eb7711e99/
Log: test and fix
diff --git a/rpython/jit/metainterp/optimizeopt/info.py
b/rpython/jit/metainterp/optimizeopt/info.py
--- a/rpython/jit/metainterp/optimizeopt/info.py
+++ b/rpython/jit/metainterp/optimizeopt/info.py
@@ -77,7 +77,11 @@
def make_guards(self, op, short, optimizer):
pass
-
+
+ @specialize.arg(2)
+ def get_constant_string_spec(self, string_optimizer, mode):
+ return None # can't be constant
+
class NonNullPtrInfo(PtrInfo):
_attrs_ = ('last_guard_pos',)
last_guard_pos = -1
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
b/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
@@ -5873,7 +5873,16 @@
p1 = getfield_gc_i(p0, descr=otherdescr)
finish(p1)
"""
- self.optimize_loop(ops, expected)
+ self.optimize_loop(ops, expected)
+
+ def test_nonnull_str2unicode(self):
+ ops = """
+ [p0]
+ guard_nonnull(p0) []
+ p1 = call_r(0, p0, descr=s2u_descr) # string -> unicode
+ finish(p1)
+ """
+ self.optimize_loop(ops, ops)
class TestLLtype(BaseTestOptimizeBasic, LLtypeMixin):
pass
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
