Author: Armin Rigo <[email protected]>
Branch: stmgc-c7
Changeset: r76484:3628a602564d
Date: 2015-03-21 08:48 +0100
http://bitbucket.org/pypy/pypy/changeset/3628a602564d/
Log: Disable the jitprof.Profiler class with stm, as an attempt to reduce
conflicts.
diff --git a/rpython/jit/metainterp/warmspot.py
b/rpython/jit/metainterp/warmspot.py
--- a/rpython/jit/metainterp/warmspot.py
+++ b/rpython/jit/metainterp/warmspot.py
@@ -38,6 +38,9 @@
ProfilerClass = Profiler
# Always use Profiler here, which should have a very low impact.
# Otherwise you can try with ProfilerClass = EmptyProfiler.
+ # We do that for stm to avoid conflicts.
+ if translator.config.translation.stm:
+ ProfilerClass = EmptyProfiler
warmrunnerdesc = WarmRunnerDesc(translator,
translate_support_code=True,
listops=True,
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
