[pypy-commit] pypy jit-targets: jumps are allowed to jump to a TargetToken beloning to another procedure

hakanardo noreply at buildbot.pypy.org
Tue Nov 8 10:27:07 CET 2011


Author: Hakan Ardo <hakan at debian.org>
Branch: jit-targets
Changeset: r48907:0ba1948f37c5
Date: 2011-11-08 08:33 +0100
http://bitbucket.org/pypy/pypy/changeset/0ba1948f37c5/

Log:	jumps are allowed to jump to a TargetToken beloning to another
	procedure

diff --git a/pypy/jit/metainterp/history.py b/pypy/jit/metainterp/history.py
--- a/pypy/jit/metainterp/history.py
+++ b/pypy/jit/metainterp/history.py
@@ -829,7 +829,7 @@
         self.check_consistency_of(self.inputargs, self.operations)
         for op in self.operations:
             descr = op.getdescr()
-            if isinstance(descr, TargetToken):
+            if op.getopnum() == rop.LABEL and isinstance(descr, TargetToken):
                 assert descr.original_jitcell_token is self.original_jitcell_token
 
     @staticmethod
diff --git a/pypy/jit/metainterp/test/test_recursive.py b/pypy/jit/metainterp/test/test_recursive.py
--- a/pypy/jit/metainterp/test/test_recursive.py
+++ b/pypy/jit/metainterp/test/test_recursive.py
@@ -530,8 +530,8 @@
             result = 0
             for i in range(m):
                 result += f('+-cl--', i)
-        g(50)
-        self.meta_interp(g, [50], backendopt=True)
+        res = self.meta_interp(g, [50], backendopt=True)
+        assert res == g(50)
         py.test.skip("tracing from start is by now only longer enabled "
                      "if a trace gets too big")
         self.check_tree_loop_count(3)


More information about the pypy-commit mailing list