Author: Armin Rigo <[email protected]>
Branch:
Changeset: r57361:8de56f9d3a75
Date: 2012-09-16 21:09 +0200
http://bitbucket.org/pypy/pypy/changeset/8de56f9d3a75/
Log: merge heads
diff --git a/pypy/jit/backend/test/test_random.py
b/pypy/jit/backend/test/test_random.py
--- a/pypy/jit/backend/test/test_random.py
+++ b/pypy/jit/backend/test/test_random.py
@@ -554,6 +554,7 @@
self.startvars = startvars
self.prebuilt_ptr_consts = []
self.r = r
+ self.subloops = []
self.build_random_loop(cpu, builder_factory, r, startvars, allow_delay)
def build_random_loop(self, cpu, builder_factory, r, startvars,
allow_delay):
@@ -724,6 +725,7 @@
return False
# generate the branch: a sequence of operations that ends in a FINISH
subloop = DummyLoop([])
+ self.subloops.append(subloop) # keep around for debugging
if guard_op.is_guard_exception():
subloop.operations.append(exc_handling(guard_op))
bridge_builder = self.builder.fork(self.builder.cpu, subloop,
@@ -760,9 +762,6 @@
args = [x.clonebox() for x in subset]
rl = RandomLoop(self.builder.cpu, self.builder.fork,
r, args)
- dump(rl.loop)
- self.cpu.compile_loop(rl.loop.inputargs, rl.loop.operations,
- rl.loop._jitcelltoken)
# done
self.should_fail_by = rl.should_fail_by
self.expected = rl.expected
diff --git a/pypy/jit/backend/x86/assembler.py
b/pypy/jit/backend/x86/assembler.py
--- a/pypy/jit/backend/x86/assembler.py
+++ b/pypy/jit/backend/x86/assembler.py
@@ -1843,6 +1843,7 @@
"""Generate the initial code for handling a failure. We try to
keep it as compact as possible.
"""
+ assert guardtok.faildescr.index < 0 # must not have an index so far
fail_index = self.cpu.get_fail_descr_number(guardtok.faildescr)
mc = self.mc
startpos = mc.get_relative_pos()
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
