[pypy-commit] pypy default: like this, I hope

[cfbolz]

Author: Carl Friedrich Bolz-Tereick <cfbolz at gmx.de>
Branch: 
Changeset: r94202:a145a9a4581b
Date: 2018-03-31 17:04 +0200
http://bitbucket.org/pypy/pypy/changeset/a145a9a4581b/

Log:	like this, I hope

diff --git a/pypy/module/pypyjit/interp_resop.py b/pypy/module/pypyjit/interp_resop.py
--- a/pypy/module/pypyjit/interp_resop.py
+++ b/pypy/module/pypyjit/interp_resop.py
@@ -113,14 +113,13 @@
             ofs = ops_offset.get(op, 0)
         num = op.getopnum()
         name = op.getopname()
-        repr_op = logops.repr_of_resop(op)
         if num == rop.DEBUG_MERGE_POINT:
             jd_sd = jitdrivers_sd[op.getarg(0).getint()]
             greenkey = op.getarglist()[3:]
             repr = jd_sd.warmstate.get_location_str(greenkey)
             w_greenkey = wrap_greenkey(space, jd_sd.jitdriver, greenkey, repr)
             l_w.append(DebugMergePoint(space, name,
-                                       repr_op,
+                                       logops.repr_of_resop(op),
                                        jd_sd.jitdriver.name,
                                        op.getarg(1).getint(),
                                        op.getarg(2).getint(),
@@ -130,10 +129,11 @@
             if descr is not None: # can be none in on_abort!
                 hash = op.getdescr().get_jitcounter_hash()
             else:
-                hash = -1
-            l_w.append(GuardOp(name, ofs, repr_op, hash))
+                hash = r_uint(0)
+            l_w.append(GuardOp(name, ofs, logops.repr_of_resop(op),
+                hash))
         else:
-            l_w.append(WrappedOp(name, ofs, repr_op))
+            l_w.append(WrappedOp(name, ofs, logops.repr_of_resop(op)))
     return l_w
 
 @unwrap_spec(offset=int, repr='text', name='text')
diff --git a/pypy/module/pypyjit/test/test_jit_hook.py b/pypy/module/pypyjit/test/test_jit_hook.py
--- a/pypy/module/pypyjit/test/test_jit_hook.py
+++ b/pypy/module/pypyjit/test/test_jit_hook.py
@@ -242,6 +242,7 @@
         assert name == 'pypyjit'
         assert reason == 'ABORT_TOO_LONG'
         assert len(ops) == 4
+        assert ops[0].hash == 0
 
     def test_creation(self):
         from pypyjit import ResOperation