[pypy-svn] r78141 - in pypy/branch/cleanup-dict-impl/pypy: config interpreter jit/tl objspace/std objspace/std/test

[arigo at codespeak.net]

Author: arigo
Date: Wed Oct 20 17:29:13 2010
New Revision: 78141

Removed:
   pypy/branch/cleanup-dict-impl/pypy/objspace/std/inlinedict.py
   pypy/branch/cleanup-dict-impl/pypy/objspace/std/test/test_inlinedict.py
Modified:
   pypy/branch/cleanup-dict-impl/pypy/config/pypyoption.py
   pypy/branch/cleanup-dict-impl/pypy/interpreter/typedef.py
   pypy/branch/cleanup-dict-impl/pypy/jit/tl/pypyjit.py
Log:
(cfbolz, arigo) Kill inlinedict.


Modified: pypy/branch/cleanup-dict-impl/pypy/config/pypyoption.py
==============================================================================
--- pypy/branch/cleanup-dict-impl/pypy/config/pypyoption.py	(original)
+++ pypy/branch/cleanup-dict-impl/pypy/config/pypyoption.py	Wed Oct 20 17:29:13 2010
@@ -237,15 +237,10 @@
                    "about dictionaries",
                    default=False),
 
-        BoolOption("withinlineddict",
-                   "make instances more compact by revoming a level of indirection",
-                   default=False),
-
         BoolOption("withmapdict",
                    "make instances really small but slow without the JIT",
                    default=False,
-                   requires=[("objspace.std.withinlineddict", False),
-                             ("objspace.std.withsharingdict", False),
+                   requires=[("objspace.std.withsharingdict", False),
                              ("objspace.std.getattributeshortcut", True),
                              ("objspace.std.withtypeversion", True),
                        ]),
@@ -336,7 +331,6 @@
         config.objspace.std.suggest(newshortcut=True)        
         if type_system != 'ootype':
             config.objspace.std.suggest(withsharingdict=True)
-        config.objspace.std.suggest(withinlineddict=True)
 
     # extra costly optimizations only go in level 3
     if level == '3':

Modified: pypy/branch/cleanup-dict-impl/pypy/interpreter/typedef.py
==============================================================================
--- pypy/branch/cleanup-dict-impl/pypy/interpreter/typedef.py	(original)
+++ pypy/branch/cleanup-dict-impl/pypy/interpreter/typedef.py	Wed Oct 20 17:29:13 2010
@@ -262,16 +262,7 @@
                 return self.slots_w[index]
         add(Proto)
 
-    wantdict = "dict" in features
-    if wantdict and config.objspace.std.withinlineddict:
-        from pypy.objspace.std.objectobject import W_ObjectObject
-        from pypy.objspace.std.inlinedict import make_mixin
-        if supercls is W_ObjectObject:
-            Mixin = make_mixin(config)
-            add(Mixin)
-            wantdict = False
-
-    if wantdict:
+    if "dict" in features:
         base_user_setup = supercls.user_setup.im_func
         if "user_setup" in body:
             base_user_setup = body["user_setup"]

Modified: pypy/branch/cleanup-dict-impl/pypy/jit/tl/pypyjit.py
==============================================================================
--- pypy/branch/cleanup-dict-impl/pypy/jit/tl/pypyjit.py	(original)
+++ pypy/branch/cleanup-dict-impl/pypy/jit/tl/pypyjit.py	Wed Oct 20 17:29:13 2010
@@ -44,7 +44,6 @@
 config.objspace.usemodules._ffi = True
 #
 set_pypy_opt_level(config, level='jit')
-config.objspace.std.withinlineddict = True
 
 if BACKEND == 'c':
     config.objspace.std.multimethods = 'mrd'