[pypy-commit] pypy vmprof: merge

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: vmprof
Changeset: r74969:2261c6164873
Date: 2014-12-17 14:01 +0100
http://bitbucket.org/pypy/pypy/changeset/2261c6164873/

Log:	merge

diff --git a/pypy/module/_vmprof/interp_vmprof.py b/pypy/module/_vmprof/interp_vmprof.py
--- a/pypy/module/_vmprof/interp_vmprof.py
+++ b/pypy/module/_vmprof/interp_vmprof.py
@@ -100,6 +100,10 @@
         self._vmprof_virtual_ip = _vmprof.get_next_virtual_IP()
         self._vmprof_registered = 0
 
+# avoid rtyper warnings
+PyCode._vmprof_virtual_ip = 0
+PyCode._vmprof_registered = 0
+
 
 
 def get_virtual_ip(gc_frame):