[pypy-commit] pypy jit-leaner-frontend: fix
arigo
pypy.commits at gmail.com
Tue Mar 22 15:03:35 EDT 2016
Author: Armin Rigo <arigo at tunes.org>
Branch: jit-leaner-frontend
Changeset: r83274:46299b0a7723
Date: 2016-03-22 19:41 +0100
http://bitbucket.org/pypy/pypy/changeset/46299b0a7723/
Log: fix
diff --git a/rpython/jit/metainterp/graphpage.py b/rpython/jit/metainterp/graphpage.py
--- a/rpython/jit/metainterp/graphpage.py
+++ b/rpython/jit/metainterp/graphpage.py
@@ -170,7 +170,8 @@
while True:
op = operations[opindex]
op_repr = op.repr(self.memo, graytext=True)
- if op.getopnum() == rop.DEBUG_MERGE_POINT:
+ if (op.getopnum() == rop.DEBUG_MERGE_POINT and
+ self.metainterp_sd is not None):
jd_sd = self.metainterp_sd.jitdrivers_sd[op.getarg(0).getint()]
if jd_sd._get_printable_location_ptr:
s = jd_sd.warmstate.get_location_str(op.getarglist()[3:])
More information about the pypy-commit
mailing list