Author: Armin Rigo <[email protected]>
Branch:
Changeset: r76748:523b8af1cd1c
Date: 2015-04-08 10:00 +0200
http://bitbucket.org/pypy/pypy/changeset/523b8af1cd1c/
Log: Test and fix
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py
b/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py
@@ -3807,6 +3807,7 @@
ops = '''
[p1, i1, i2]
p2 = call_pure(0, p1, i1, i2, descr=strslicedescr)
+ guard_no_exception() []
escape(p2)
jump(p1, i1, i2)
'''
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
@@ -597,6 +597,7 @@
vright.ensure_nonnull()
value = self.make_vstring_concat(op.result, op, mode)
value.setup(vleft, vright)
+ self.last_emitted_operation = REMOVED
return True
def opt_call_stroruni_STR_SLICE(self, op, mode):
@@ -626,6 +627,7 @@
#
value = self.make_vstring_slice(op.result, op, mode)
value.setup(vstr, vstart, self.getvalue(lengthbox))
+ self.last_emitted_operation = REMOVED
return True
def opt_call_stroruni_STR_EQUAL(self, op, mode):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
