Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: vmprof2
Changeset: r76919:afd3d870360e
Date: 2015-04-24 14:55 +0200
http://bitbucket.org/pypy/pypy/changeset/afd3d870360e/
Log: one missing place
diff --git a/pypy/module/_vmprof/test/test__vmprof.py
b/pypy/module/_vmprof/test/test__vmprof.py
--- a/pypy/module/_vmprof/test/test__vmprof.py
+++ b/pypy/module/_vmprof/test/test__vmprof.py
@@ -27,6 +27,10 @@
i += 1 # length
i += len('pypy')
while i < len(s):
+ if s[i] == '\x03':
+ break
+ if s[i] == '\x01':
+ xxx
assert s[i] == '\x02'
i += 1
_, size = struct.unpack("ll", s[i:i + 2 * WORD])
diff --git a/rpython/jit/backend/llsupport/asmmemmgr.py
b/rpython/jit/backend/llsupport/asmmemmgr.py
--- a/rpython/jit/backend/llsupport/asmmemmgr.py
+++ b/rpython/jit/backend/llsupport/asmmemmgr.py
@@ -319,9 +319,10 @@
assert gcrootmap is not None
for pos, mark in self.gcroot_markers:
gcrootmap.register_asm_addr(rawstart + pos, mark)
- cpu.codemap.register_frame_depth_map(rawstart, rawstart + size,
- self.frame_positions,
- self.frame_assignments)
+ if cpu.HAS_CODEMAP:
+ cpu.codemap.register_frame_depth_map(rawstart, rawstart + size,
+ self.frame_positions,
+ self.frame_assignments)
self.frame_positions = None
self.frame_assignments = None
return rawstart
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
