[pypy-commit] pypy non-null-app-dict: use the hint also on string-based dicts

fijal noreply at buildbot.pypy.org
Tue Jun 28 18:51:06 CEST 2011

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: non-null-app-dict
Changeset: r45165:44b4ba2ac43e
Date: 2011-06-28 18:57 +0200

Log:	use the hint also on string-based dicts

diff --git a/pypy/objspace/std/dictmultiobject.py b/pypy/objspace/std/dictmultiobject.py
--- a/pypy/objspace/std/dictmultiobject.py
+++ b/pypy/objspace/std/dictmultiobject.py
@@ -1,13 +1,14 @@
 import py, sys
 from pypy.objspace.std.model import registerimplementation, W_Object
 from pypy.objspace.std.register_all import register_all
+from pypy.objspace.std.settype import set_typedef as settypedef
 from pypy.interpreter import gateway
 from pypy.interpreter.argument import Signature
 from pypy.interpreter.error import OperationError, operationerrfmt
 from pypy.module.__builtin__.__init__ import BUILTIN_TO_INDEX, OPTIMIZED_BUILTINS
 from pypy.rlib.objectmodel import r_dict, we_are_translated
-from pypy.objspace.std.settype import set_typedef as settypedef
+from pypy.rlib.debug import mark_dict_non_null
 def _is_str(space, w_key):
     return space.is_w(space.type(w_key), space.w_str)
@@ -309,6 +310,7 @@
     def __init__(self, space):
         self.space = space
         self.content = {}
+        mark_dict_non_null(self.content)
     def impl_setitem(self, w_key, w_value):
         space = self.space

More information about the pypy-commit mailing list