Author: Maciej Fijalkowski <[email protected]>
Branch: cleanup-llgraph-backend
Changeset: r58195:d7ee947cd7bd
Date: 2012-10-18 10:42 +0200
http://bitbucket.org/pypy/pypy/changeset/d7ee947cd7bd/
Log: fix the last test
diff --git a/pypy/jit/backend/llgraph/runner.py
b/pypy/jit/backend/llgraph/runner.py
--- a/pypy/jit/backend/llgraph/runner.py
+++ b/pypy/jit/backend/llgraph/runner.py
@@ -786,7 +786,13 @@
return x
def execute_debug_merge_point(self, descr, *args):
- pass
+ from pypy.jit.metainterp.warmspot import get_stats
+ try:
+ stats = get_stats()
+ except AttributeError:
+ pass
+ else:
+ stats.add_merge_point_location(args[1:])
def execute_new_with_vtable(self, _, vtable):
descr = heaptracker.vtable2descr(self.cpu, vtable)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
