Author: Maciej Fijalkowski <[email protected]>
Branch: remember-tracing-counts
Changeset: r79629:7f56502060bf
Date: 2015-09-14 15:37 +0200
http://bitbucket.org/pypy/pypy/changeset/7f56502060bf/
Log: make sure we call the correct method
diff --git a/pypy/module/pypyjit/interp_jit.py
b/pypy/module/pypyjit/interp_jit.py
--- a/pypy/module/pypyjit/interp_jit.py
+++ b/pypy/module/pypyjit/interp_jit.py
@@ -252,7 +252,7 @@
return
for i, op in enumerate(debug_info.operations):
if op.is_guard():
- w_t = space.newtuple([space.wrap(i),
space.wrap(op.getopnum()), space.wrap(op.get_hash())])
+ w_t = space.newtuple([space.wrap(i),
space.wrap(op.getopnum()), space.wrap(op.getdescr().get_jitcounter_hash())])
l_w.append(w_t)
try:
cache.in_recursion = True
diff --git a/rpython/jit/metainterp/compile.py
b/rpython/jit/metainterp/compile.py
--- a/rpython/jit/metainterp/compile.py
+++ b/rpython/jit/metainterp/compile.py
@@ -738,7 +738,7 @@
metainterp.handle_guard_failure(self, deadframe)
_trace_and_compile_from_bridge._dont_inline_ = True
- def get_hash(self):
+ def get_jitcounter_hash(self):
return self.status & self.ST_SHIFT_MASK
def must_compile(self, deadframe, metainterp_sd, jitdriver_sd):
diff --git a/rpython/jit/metainterp/test/test_jitiface.py
b/rpython/jit/metainterp/test/test_jitiface.py
--- a/rpython/jit/metainterp/test/test_jitiface.py
+++ b/rpython/jit/metainterp/test/test_jitiface.py
@@ -245,13 +245,13 @@
def after_compile(self, debug_info):
for op in debug_info.operations:
if op.is_guard():
- hashes.l.append(op.getdescr().get_hash())
+ hashes.l.append(op.getdescr().get_jitcounter_hash())
def before_compile_bridge(self, debug_info):
pass
def after_compile_bridge(self, debug_info):
- hashes.t.append(debug_info.fail_descr.get_hash())
+ hashes.t.append(debug_info.fail_descr.get_jitcounter_hash())
hooks = Hooks()
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
