[svn:parrot] r40418 - in branches/auto_attrs: . include/parrot src src/gc src/interp src/runcore t/src tools/dev

[NotFound at svn.parrot.org]

Author: NotFound
Date: Wed Aug  5 12:31:59 2009
New Revision: 40418
URL: https://trac.parrot.org/parrot/changeset/40418

Log:
merge from trunk r40417

Modified:
   branches/auto_attrs/   (props changed)
   branches/auto_attrs/include/parrot/runcore_trace.h   (props changed)
   branches/auto_attrs/src/gc/generational_ms.c   (props changed)
   branches/auto_attrs/src/gc/incremental_ms.c   (props changed)
   branches/auto_attrs/src/interp/inter_create.c   (props changed)
   branches/auto_attrs/src/key.c
   branches/auto_attrs/src/runcore/cores.c   (props changed)
   branches/auto_attrs/src/runcore/trace.c   (props changed)
   branches/auto_attrs/t/src/embed.t   (props changed)
   branches/auto_attrs/tools/dev/mk_gitignore.pl   (props changed)

Modified: branches/auto_attrs/src/key.c
==============================================================================
--- branches/auto_attrs/src/key.c	Wed Aug  5 12:12:52 2009	(r40417)
+++ branches/auto_attrs/src/key.c	Wed Aug  5 12:31:59 2009	(r40418)
@@ -619,9 +619,11 @@
     }
 
     /* Mark next key */
-    GETATTR_Key_next_key(interp, key, next_key);
-    if (next_key)
-        Parrot_gc_mark_PObj_alive(interp, (PObj *)next_key);
+    if (flags == KEY_string_FLAG || flags == KEY_pmc_FLAG) {
+        GETATTR_Key_next_key(interp, key, next_key);
+        if (next_key)
+            Parrot_gc_mark_PObj_alive(interp, (PObj *)next_key);
+    }
 
 }