Author: Hakan Ardo <ha...@debian.org>
Branch: jit-usable_retrace_3
Changeset: r59618:9eaeaaba3b42
Date: 2012-12-29 11:50 +0100
http://bitbucket.org/pypy/pypy/changeset/9eaeaaba3b42/
Log: merge messup leftover from 572208cdb5a0
diff --git a/pypy/jit/metainterp/test/test_virtualstate.py
b/pypy/jit/metainterp/test/test_virtualstate.py
--- a/pypy/jit/metainterp/test/test_virtualstate.py
+++ b/pypy/jit/metainterp/test/test_virtualstate.py
@@ -1245,9 +1245,9 @@
vstate2 = modifier.get_virtual_state(jumpargs)
if isinstance(expected, type) and issubclass(expected, Exception):
with raises(expected):
- vstate = vstate1.make_guarded_generalization_of(vstate2,
jumpargs, self.optimizer)
+ vstate = vstate1.make_guardable_generalization_of(vstate2,
jumpargs, self.optimizer)
else:
- vstate = vstate1.make_guarded_generalization_of(vstate2, jumpargs,
self.optimizer)
+ vstate = vstate1.make_guardable_generalization_of(vstate2,
jumpargs, self.optimizer)
assert vstate.state == expected
def setfield(self, node, descr, box):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
