Author: Maciej Fijalkowski <[email protected]>
Branch:
Changeset: r79354:c723aedd0d05
Date: 2015-09-01 11:47 +0200
http://bitbucket.org/pypy/pypy/changeset/c723aedd0d05/
Log: add a passing test
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
@@ -8666,5 +8666,24 @@
"""
self.optimize_loop(ops, expected, expected_short=expected_short)
+ def test_pass_both_short_preamble_and_arg(self):
+ ops = """
+ [i0, i1]
+ i2 = int_add(i0, 1)
+ jump(i0, i2)
+ """
+ expected = """
+ [i0, i1, i2]
+ jump(i0, i2, i2)
+ """
+ preamble = """
+ [i0, i1]
+ i2 = int_add(i0, 1)
+ i3 = same_as(i2)
+ jump(i0, i2, i3)
+ """
+ self.optimize_loop(ops, expected, preamble)
+
+
class TestLLtype(OptimizeOptTest, LLtypeMixin):
pass
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
@@ -315,6 +315,7 @@
# Construct jumpargs from the virtual state
original_jumpargs = jumpop.getarglist()[:]
values = [self.getvalue(arg) for arg in jumpop.getarglist()]
+
try:
jumpargs = virtual_state.make_inputargs(values, self.optimizer)
except BadVirtualState:
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit