Promoting elements transitions to their own field.

src/mark-compact.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 1846 matching lines @@
     Object* obj = *slot;
     if (!obj->NonFailureIsHeapObject()) continue;
     mark_compact_collector()->RecordSlot(start_slot, slot, obj);
     base_marker()->MarkObjectAndPush(reinterpret_cast<HeapObject*>(obj));
   }
 }
 
 
 template <class T>
 void Marker<T>::MarkDescriptorArray(DescriptorArray* descriptors) {
+  // printf("marking: %p\n", static_cast<void*>(descriptors));

[danno, 2012/06/01 13:49:55]

Remove debugging code.

[Toon Verwaest, 2012/06/04 09:17:48]

Done.

   // Empty descriptor array is marked as a root before any maps are marked.
   ASSERT(descriptors != descriptors->GetHeap()->empty_descriptor_array());
 
   if (!base_marker()->MarkObjectWithoutPush(descriptors)) return;
   Object** descriptor_start = descriptors->data_start();
 
   if (descriptors->HasEnumCache()) {
     Object** enum_cache_slot = descriptors->GetEnumCacheSlot();
     Object* enum_cache = *enum_cache_slot;
     base_marker()->MarkObjectAndPush(
         reinterpret_cast<HeapObject*>(enum_cache));
     mark_compact_collector()->RecordSlot(descriptor_start,
                                          enum_cache_slot,
                                          enum_cache);
   }
 
+  // TODO(verwaest) Make sure we free unused transitions.
+  if (descriptors->elements_transition() != NULL) {
+    Object** transitions_slot = descriptors->GetTransitionsSlot();
+    Object* transitions = *transitions_slot;
+    base_marker()->MarkObjectAndPush(
+        reinterpret_cast<HeapObject*>(transitions));
+    mark_compact_collector()->RecordSlot(descriptor_start,
+                                         transitions_slot,
+                                         transitions);
+  }
+
   // If the descriptor contains a transition (value is a Map), we don't mark the
   // value as live. It might be set to the NULL_DESCRIPTOR in
   // ClearNonLiveTransitions later.
   for (int i = 0; i < descriptors->number_of_descriptors(); ++i) {
     Object** key_slot = descriptors->GetKeySlot(i);
     Object* key = *key_slot;
     if (key->IsHeapObject()) {
       base_marker()->MarkObjectAndPush(reinterpret_cast<HeapObject*>(key));
       mark_compact_collector()->RecordSlot(descriptor_start, key_slot, key);
     }
@@ skipping 18 matching lines @@
         break;
       case CALLBACKS:
         if (!value->IsAccessorPair()) {
           base_marker()->MarkObjectAndPush(value);
         } else if (base_marker()->MarkObjectWithoutPush(value)) {
           AccessorPair* accessors = AccessorPair::cast(value);
           MarkAccessorPairSlot(accessors, AccessorPair::kGetterOffset);
           MarkAccessorPairSlot(accessors, AccessorPair::kSetterOffset);
         }
         break;
-      case ELEMENTS_TRANSITION:
-        // For maps with multiple elements transitions, the transition maps are
-        // stored in a FixedArray. Keep the fixed array alive but not the maps
-        // that it refers to.
-        if (value->IsFixedArray()) base_marker()->MarkObjectWithoutPush(value);
-        break;
       case MAP_TRANSITION:
       case CONSTANT_TRANSITION:
       case NULL_DESCRIPTOR:
         break;
     }
   }
 }
 
 
 template <class T>
@@ skipping 2178 matching lines @@
   while (buffer != NULL) {
     SlotsBuffer* next_buffer = buffer->next();
     DeallocateBuffer(buffer);
     buffer = next_buffer;
   }
   *buffer_address = NULL;
 }
 
 
 } }  // namespace v8::internal