[pypy-commit] pypy default: Bah. Fix

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r45308:7bf584b32555
Date: 2011-07-03 09:05 +0200
http://bitbucket.org/pypy/pypy/changeset/7bf584b32555/

Log:	Bah. Fix

diff --git a/pypy/jit/metainterp/optimizeopt/__init__.py b/pypy/jit/metainterp/optimizeopt/__init__.py
--- a/pypy/jit/metainterp/optimizeopt/__init__.py
+++ b/pypy/jit/metainterp/optimizeopt/__init__.py
@@ -28,11 +28,7 @@
                     inline_short_preamble=True, retraced=False):
     config = metainterp_sd.config
     optimizations = []
-    if enable_opts == 'all':
-        enable_opts = ALL_OPTS_LIST
-    else:
-        enable_opts = enable_opts.split(':')
-    unroll = 'unroll' in enable_opts
+    unroll = 'unroll' in enable_opts    # 'enable_opts' is normally a dict
     for name, opt in unroll_all_opts:
         if name in enable_opts:
             if opt is not None:
diff --git a/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.py b/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.py
--- a/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.py
+++ b/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.py
@@ -32,10 +32,6 @@
     chain, _ = build_opt_chain(metainterp_sd, "")
     check(chain, ["OptInlineShortPreamble", "OptSimplify"])
     #
-    chain, _ = build_opt_chain(metainterp_sd, "all")
-    check(chain, ["OptInlineShortPreamble", "OptIntBounds", "OptRewrite",
-                  "OptVirtualize", "OptString", "OptHeap", "OptFfiCall"])
-    #
     chain, _ = build_opt_chain(metainterp_sd, "heap:intbounds")
     check(chain, ["OptInlineShortPreamble", "OptIntBounds", "OptHeap", "OptSimplify"])
     #
diff --git a/pypy/jit/metainterp/warmstate.py b/pypy/jit/metainterp/warmstate.py
--- a/pypy/jit/metainterp/warmstate.py
+++ b/pypy/jit/metainterp/warmstate.py
@@ -237,7 +237,7 @@
         d = {}
         if NonConstant(False):
             value = 'blah' # not a constant ''
-        if value is None:
+        if value is None or value == 'all':
             value = ALL_OPTS_NAMES
         for name in value.split(":"):
             if name: