[pypy-svn] r31791 - in pypy/branch/no-zeroing-assumption-2/pypy/rpython: . lltypesystem

mwh at codespeak.net mwh at codespeak.net
Tue Aug 29 15:50:30 CEST 2006


Author: mwh
Date: Tue Aug 29 15:50:29 2006
New Revision: 31791

Modified:
   pypy/branch/no-zeroing-assumption-2/pypy/rpython/lltypesystem/lltype.py
   pypy/branch/no-zeroing-assumption-2/pypy/rpython/rcpy.py
Log:
cpy flavored mallocs should be zeroed.


Modified: pypy/branch/no-zeroing-assumption-2/pypy/rpython/lltypesystem/lltype.py
==============================================================================
--- pypy/branch/no-zeroing-assumption-2/pypy/rpython/lltypesystem/lltype.py	(original)
+++ pypy/branch/no-zeroing-assumption-2/pypy/rpython/lltypesystem/lltype.py	Tue Aug 29 15:50:29 2006
@@ -1560,7 +1560,7 @@
 
 
 def malloc(T, n=None, flavor='gc', immortal=False, extra_args=(), zero=False):
-    if zero or immortal:
+    if zero or immortal or flavor == 'cpy':
         initialization = 'example'
     elif flavor == 'raw':
         initialization = 'raw'

Modified: pypy/branch/no-zeroing-assumption-2/pypy/rpython/rcpy.py
==============================================================================
--- pypy/branch/no-zeroing-assumption-2/pypy/rpython/rcpy.py	(original)
+++ pypy/branch/no-zeroing-assumption-2/pypy/rpython/rcpy.py	Tue Aug 29 15:50:29 2006
@@ -255,8 +255,7 @@
 
         # build the PyTypeObject structure
         pytypeobj = lltype.malloc(PY_TYPE_OBJECT, flavor='cpy',
-                                  extra_args=(typetype,),
-                                  zero=True)
+                                  extra_args=(typetype,))
         name = cpytype.name
         T = lltype.FixedSizeArray(lltype.Char, len(name)+1)
         p = lltype.malloc(T, immortal=True)



More information about the Pypy-commit mailing list