[pypy-commit] pypy default: (mattip, plan_rich) fix test_debug_merge_point, it used encode_addr instead of encode_64bit value (failed on 32bit)

[plan_rich]

Author: Richard Plangger <planrichi at gmail.com>
Branch: 
Changeset: r85857:f051867d04fa
Date: 2016-07-25 17:37 +0200
http://bitbucket.org/pypy/pypy/changeset/f051867d04fa/

Log:	(mattip, plan_rich) fix test_debug_merge_point, it used encode_addr
	instead of encode_64bit value (failed on 32bit)

diff --git a/rpython/rlib/rjitlog/rjitlog.py b/rpython/rlib/rjitlog/rjitlog.py
--- a/rpython/rlib/rjitlog/rjitlog.py
+++ b/rpython/rlib/rjitlog/rjitlog.py
@@ -436,7 +436,8 @@
 
     def write(self, args, ops, ops_offset={}):
         log = self.logger
-        log._write_marked(self.tag, encode_le_64bit(self.logger.trace_id))
+        tid = self.logger.trace_id
+        log._write_marked(self.tag, encode_le_64bit(tid))
 
         # input args
         str_args = [self.var_to_str(arg) for arg in args]
diff --git a/rpython/rlib/rjitlog/test/test_jitlog.py b/rpython/rlib/rjitlog/test/test_jitlog.py
--- a/rpython/rlib/rjitlog/test/test_jitlog.py
+++ b/rpython/rlib/rjitlog/test/test_jitlog.py
@@ -55,9 +55,9 @@
         fd.close()
         logger.finish()
         binary = file.read()
-        assert binary == (jl.MARK_START_TRACE) + jl.encode_le_addr(0) + \
+        assert binary == (jl.MARK_START_TRACE) + jl.encode_le_addr(1) + \
                          jl.encode_str('loop') + jl.encode_le_addr(0) + \
-                         (jl.MARK_TRACE) + jl.encode_le_addr(0) + \
+                         (jl.MARK_TRACE) + jl.encode_le_64bit(1) + \
                          (jl.MARK_INPUT_ARGS) + jl.encode_str('') + \
                          (jl.MARK_INIT_MERGE_POINT) + b'\x05\x00\x01s\x00i\x08s\x00i\x10s' + \
                          (jl.MARK_MERGE_POINT) + \