[svn:parrot] r35358 - in branches/pdd09gc_part1: include/parrot src src/gc

Author: Whiteknight
Date: Sat Jan 10 14:01:37 2009
New Revision: 35358

Modified:
   branches/pdd09gc_part1/include/parrot/pobj.h
   branches/pdd09gc_part1/src/gc/dod.c
   branches/pdd09gc_part1/src/gc/incremental_ms.c
   branches/pdd09gc_part1/src/pmc.c

Log:
[pdd09gc_part1] remove real_self from this branch, since we've removed it from trunk and it was being marked by the GC

Modified: branches/pdd09gc_part1/include/parrot/pobj.h
==============================================================================
--- branches/pdd09gc_part1/include/parrot/pobj.h	(original)
+++ branches/pdd09gc_part1/include/parrot/pobj.h	Sat Jan 10 14:01:37 2009
@@ -141,7 +141,6 @@
     VTABLE         *vtable;
     DPOINTER       *data;
     struct PMC_EXT *pmc_ext;
-    PMC            *real_self;
 };
 
 struct _Sync;   /* forward decl */

Modified: branches/pdd09gc_part1/src/gc/dod.c
==============================================================================
--- branches/pdd09gc_part1/src/gc/dod.c	(original)
+++ branches/pdd09gc_part1/src/gc/dod.c	Sat Jan 10 14:01:37 2009
@@ -182,9 +182,6 @@
         if (PObj_is_PMC_TEST(obj)) {
             PMC * const p = (PMC *)obj;
 
-            if (p->real_self != p)
-                pobject_lives(interp, (PObj *)p->real_self);
-
         /* if object is a PMC and contains buffers or PMCs, then attach the PMC
          * to the chained mark list. */
             if (PObj_is_special_PMC_TEST(obj))

Modified: branches/pdd09gc_part1/src/gc/incremental_ms.c
==============================================================================
--- branches/pdd09gc_part1/src/gc/incremental_ms.c	(original)
+++ branches/pdd09gc_part1/src/gc/incremental_ms.c	Sat Jan 10 14:01:37 2009
@@ -657,7 +657,6 @@
 
 Places to search (for PMCs):
 1) C<PMC_metadata(obj)>
-2) C<obj->real_self>
 3) C<PMC_next_for_GC(obj)>
 4) C<obj->pmc_ext>
 5) C<VTABLE_mark(obj)>, if C<PObj_custom_mark_TEST(obj) == 1>
@@ -704,10 +703,6 @@
             pobject_lives(interp, (PObj *)PMC_next_for_GC(pmc));
     }
 
-    if (pmc->real_self != pmc && pmc->real_self != NULL)
-        pobject_lives(interp, (PObj *)(pmc->real_self));
-
-
     /* if the PMC is an array of other PMCs, we cycle through those. I'm
        surprised if this isn't covered by VTABLE_mark, but I won't question it
        now. */

Modified: branches/pdd09gc_part1/src/pmc.c
==============================================================================
--- branches/pdd09gc_part1/src/pmc.c	(original)
+++ branches/pdd09gc_part1/src/pmc.c	Sat Jan 10 14:01:37 2009
@@ -250,7 +250,6 @@
             PARROT_ASSERT(pmc);
 
             pmc->vtable    = vtable;
-            pmc->real_self = pmc;
             VTABLE_set_pointer(interp, pmc, pmc);
         }
 
@@ -287,7 +286,6 @@
 
     pmc            = new_pmc_header(interp, flags);
     pmc->vtable    = vtable;
-    pmc->real_self = pmc;
 
 #if GC_VERBOSE
     if (Interp_flags_TEST(interp, PARROT_TRACE_FLAG)) {

• [svn:parrot] r35358 - in branches/pdd09gc_part1: include/parrot src src/gc by Whiteknight