Author: Hakan Ardo <ha...@debian.org>
Branch: jit-targets
Changeset: r50356:6c6cf4df068d
Date: 2011-12-10 16:58 +0100
http://bitbucket.org/pypy/pypy/changeset/6c6cf4df068d/
Log: hg merge
diff --git a/pypy/jit/backend/x86/test/test_recompilation.py
b/pypy/jit/backend/x86/test/test_recompilation.py
--- a/pypy/jit/backend/x86/test/test_recompilation.py
+++ b/pypy/jit/backend/x86/test/test_recompilation.py
@@ -116,9 +116,9 @@
i11 = int_add(i12, i6)
jump(i3, i12, i11, i10, i6, i7, descr=targettoken)
'''
+ loop_frame_depth = loop._jitcelltoken.compiled_loop_token.frame_depth
bridge = self.attach_bridge(ops, loop, 6)
guard_op = loop.operations[6]
- loop_frame_depth = loop._jitcelltoken.compiled_loop_token.frame_depth
assert loop._jitcelltoken.compiled_loop_token.param_depth == 0
# the force_spill() forces the stack to grow
assert guard_op.getdescr()._x86_bridge_frame_depth > loop_frame_depth
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
