[pypy-commit] pypy stmgc-c7: Bah, PyPyJitDriver did not have 'stm_report_location'.

arigo noreply at buildbot.pypy.org
Sun Jan 18 17:16:51 CET 2015


Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c7
Changeset: r75428:10b577c5d4b1
Date: 2015-01-18 17:16 +0100
http://bitbucket.org/pypy/pypy/changeset/10b577c5d4b1/

Log:	Bah, PyPyJitDriver did not have 'stm_report_location'.

diff --git a/pypy/module/pypyjit/interp_jit.py b/pypy/module/pypyjit/interp_jit.py
--- a/pypy/module/pypyjit/interp_jit.py
+++ b/pypy/module/pypyjit/interp_jit.py
@@ -43,6 +43,7 @@
     reds = ['frame', 'ec']
     greens = ['next_instr', 'is_being_profiled', 'pycode']
     virtualizables = ['frame']
+    stm_report_location = [0, 2]   # 'next_instr', 'pycode'
 
 pypyjitdriver = PyPyJitDriver(get_printable_location = get_printable_location,
                               should_unroll_one_iteration =
diff --git a/rpython/jit/metainterp/test/test_stm.py b/rpython/jit/metainterp/test/test_stm.py
--- a/rpython/jit/metainterp/test/test_stm.py
+++ b/rpython/jit/metainterp/test/test_stm.py
@@ -50,6 +50,8 @@
                 num_box, ref_box = op.getarglist()[-2:]
                 num = num_box.getint()
                 ref = ref_box.getref_base()
+                assert num == op.stm_location.num
+                assert ref == op.stm_location.ref
                 cur_location = (num, ref)
             elif op.getopname() in ("label", "finish", "jump"):
                 pass


More information about the pypy-commit mailing list