[pypy-svn] r49792 - pypy/branch/lazy-write-barrier/pypy/rpython/memory

arigo at codespeak.net arigo at codespeak.net
Fri Dec 14 16:54:44 CET 2007


Author: arigo
Date: Fri Dec 14 16:54:44 2007
New Revision: 49792

Modified:
   pypy/branch/lazy-write-barrier/pypy/rpython/memory/gctypelayout.py
Log:
Don't overwrite the flags provided by GenerationGC.init_gc_object_immortal().


Modified: pypy/branch/lazy-write-barrier/pypy/rpython/memory/gctypelayout.py
==============================================================================
--- pypy/branch/lazy-write-barrier/pypy/rpython/memory/gctypelayout.py	(original)
+++ pypy/branch/lazy-write-barrier/pypy/rpython/memory/gctypelayout.py	Fri Dec 14 16:54:44 2007
@@ -153,7 +153,6 @@
 
         # XXX hack, a lot of gengc details here
         from pypy.rpython.memory.gc.generation import GenerationGC
-        from pypy.rpython.memory.gc.generation import GCFLAG_NEVER_SET
         if isinstance(gc, GenerationGC):
             gen_gc = True
         else:
@@ -163,10 +162,7 @@
             typeid = self.get_type_id(TYPE)
             hdr = gc.gcheaderbuilder.new_header(value)
             adr = llmemory.cast_ptr_to_adr(hdr)
-            flags = 0
-            if gen_gc:
-                flags = GCFLAG_NEVER_SET
-            gc.init_gc_object_immortal(adr, typeid, flags=flags)
+            gc.init_gc_object_immortal(adr, typeid)
 
         # The following collects the addresses of all the fields that have
         # a GC Pointer type, inside the current prebuilt object.  All such



More information about the Pypy-commit mailing list