[pypy-commit] pypy default: hg merge jit-option-refactor

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r45314:b06b6fe4b89f
Date: 2011-07-03 11:43 +0200
http://bitbucket.org/pypy/pypy/changeset/b06b6fe4b89f/

Log:	hg merge jit-option-refactor

	 changing the default to reflect the real default

diff --git a/pypy/rlib/jit.py b/pypy/rlib/jit.py
--- a/pypy/rlib/jit.py
+++ b/pypy/rlib/jit.py
@@ -292,7 +292,7 @@
               'function_threshold': 1617, # slightly more than one above 
               'trace_eagerness': 200,
               'trace_limit': 12000,
-              'inlining': 0,
+              'inlining': 1,
               'loop_longevity': 1000,
               'retrace_limit': 5,
               'enable_opts': 'all',