[pypy-svn] r69985 - pypy/branch/listcopyop/pypy/rpython/memory/gc

[arigo at codespeak.net]

Author: arigo
Date: Tue Dec  8 16:59:47 2009
New Revision: 69985

Modified:
   pypy/branch/listcopyop/pypy/rpython/memory/gc/generation.py
Log:
* move write_into_last_generation_obj() closer to its call
  from remember_young_pointer().

* comment out an assert which is not strictly needed any more.


Modified: pypy/branch/listcopyop/pypy/rpython/memory/gc/generation.py
==============================================================================
--- pypy/branch/listcopyop/pypy/rpython/memory/gc/generation.py	(original)
+++ pypy/branch/listcopyop/pypy/rpython/memory/gc/generation.py	Tue Dec  8 16:59:47 2009
@@ -466,6 +466,13 @@
         remember_young_pointer._dont_inline_ = True
         self.remember_young_pointer = remember_young_pointer
 
+    def write_into_last_generation_obj(self, addr_struct, addr):
+        objhdr = self.header(addr_struct)
+        if objhdr.tid & GCFLAG_NO_HEAP_PTRS:
+            if not self.is_last_generation(addr):
+                objhdr.tid &= ~GCFLAG_NO_HEAP_PTRS
+                self.last_generation_root_objects.append(addr_struct)
+
     def assume_young_pointers(self, addr_struct):
         objhdr = self.header(addr_struct)
         if objhdr.tid & GCFLAG_NO_YOUNG_PTRS:
@@ -481,8 +488,8 @@
         one of the following flags a bit too eagerly, which means we'll have
         a bit more objects to track, but being on the safe side.
         """
-        typeid = self.get_type_id(source_addr)
-        assert self.is_gcarrayofgcptr(typeid)
+        #typeid = self.get_type_id(source_addr)
+        #assert self.is_gcarrayofgcptr(typeid)  ...?
         source_hdr = self.header(source_addr)
         dest_hdr = self.header(dest_addr)
         if dest_hdr.tid & GCFLAG_NO_YOUNG_PTRS == 0:
@@ -498,13 +505,6 @@
                 #     gen
                 dest_hdr.tid &= ~GCFLAG_NO_HEAP_PTRS
                 self.last_generation_root_objects.append(dest_addr)
-                
-    def write_into_last_generation_obj(self, addr_struct, addr):
-        objhdr = self.header(addr_struct)
-        if objhdr.tid & GCFLAG_NO_HEAP_PTRS:
-            if not self.is_last_generation(addr):
-                objhdr.tid &= ~GCFLAG_NO_HEAP_PTRS
-                self.last_generation_root_objects.append(addr_struct)
 
     def is_last_generation(self, obj):
         # overridden by HybridGC