[pypy-commit] pypy stmgc-c8: fix to allow showing loops again

[Raemi]

Author: Remi Meier <remi.meier at gmail.com>
Branch: stmgc-c8
Changeset: r80662:6612707f9f93
Date: 2015-11-13 13:19 +0100
http://bitbucket.org/pypy/pypy/changeset/6612707f9f93/

Log:	fix to allow showing loops again

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
@@ -171,11 +171,13 @@
             op = operations[opindex]
             op_repr = op.repr(self.memo, graytext=True)
             if op.getopnum() == rop.DEBUG_MERGE_POINT:
-                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:])
-                    s = s.replace(',', '.') # we use comma for argument splitting
-                    op_repr = "debug_merge_point(%d, %d, '%s')" % (op.getarg(1).getint(), op.getarg(2).getint(), s)
+                if 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:])
+                        s = s.replace(',', '.') # we use comma for argument splitting
+                        op_repr = "debug_merge_point(%d, %d, '%s')" % (op.getarg(1).getint(),
+                                                                       op.getarg(2).getint(), s)
             lines.append(op_repr)
             if is_interesting_guard(op):
                 tgt = op.getdescr()._debug_suboperations[0]
diff --git a/rpython/jit/metainterp/history.py b/rpython/jit/metainterp/history.py
--- a/rpython/jit/metainterp/history.py
+++ b/rpython/jit/metainterp/history.py
@@ -545,9 +545,6 @@
             self.name,
             ', '.join([box.repr(memo) for box in self.inputargs]))
 
-    def get_display_text(self):    # for graphpage.py
-        return self.name + '\n' + repr(self.inputargs)
-
     def show(self, errmsg=None):
         "NOT_RPYTHON"
         from rpython.jit.metainterp.graphpage import display_procedures