Bookkeeping for allocation site pretenuring

src/heap-inl.h

 // 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 465 matching lines @@
     OS::MemMove(dst, src, static_cast<size_t>(byte_size));
   }
 }
 
 
 void Heap::ScavengePointer(HeapObject** p) {
   ScavengeObject(p, *p);
 }
 
 
+void Heap::AddressMemento(HeapObject* object) {
+  if ((FLAG_allocation_site_pretenuring || FLAG_trace_track_allocation_sites)
+      && object->IsJSObject()) {
+    AllocationMemento* memento = AllocationMemento::FindForJSObject(
+        JSObject::cast(object), true);
+    if (memento != NULL) {
+      ASSERT(memento->IsValid());
+
+      if (FLAG_allocation_site_pretenuring) {
+        // Update state

[Hannes Payer (out of office), 2013/11/21 20:52:24]

Remove this comment.

[mvstanton, 2013/11/22 11:18:51]

Done.

+        memento->GetAllocationSite()->IncrementMementoFoundCount();
+      }
+
+      // TODO(mvstanton): consider always updating this variable as long as
+      // we are tracking mementos for pretenuring purposes.
+      if (FLAG_trace_track_allocation_sites) {
+        object->GetIsolate()->heap()->allocation_mementos_found_++;

[Hannes Payer (out of office), 2013/11/21 20:52:24]

Do we still need this variable? We could just ask the allocation sites.

[mvstanton, 2013/11/22 11:18:51]

Done. Facilitated by moving the allocation site feedback digestion to the gc
epilogue.

+      }
+    }
+  }
+}
+
+
 void Heap::ScavengeObject(HeapObject** p, HeapObject* object) {
   ASSERT(object->GetIsolate()->heap()->InFromSpace(object));
 
   // We use the first word (where the map pointer usually is) of a heap
   // object to record the forwarding pointer.  A forwarding pointer can
   // point to an old space, the code space, or the to space of the new
   // generation.
   MapWord first_word = object->map_word();
 
   // If the first word is a forwarding address, the object has already been
   // copied.
   if (first_word.IsForwardingAddress()) {
     HeapObject* dest = first_word.ToForwardingAddress();
     ASSERT(object->GetIsolate()->heap()->InFromSpace(*p));
     *p = dest;
     return;
   }
 
-  if (FLAG_trace_track_allocation_sites && object->IsJSObject()) {
-    if (AllocationMemento::FindForJSObject(JSObject::cast(object), true) !=
-        NULL) {
-      object->GetIsolate()->heap()->allocation_mementos_found_++;
-    }
-  }
+  AddressMemento(object);
 
   // AllocationMementos are unrooted and shouldn't survive a scavenge
   ASSERT(object->map() != object->GetHeap()->allocation_memento_map());
   // Call the slow part of scavenge object.
   return ScavengeObjectSlow(p, object);
 }
 
 
 bool Heap::CollectGarbage(AllocationSpace space, const char* gc_reason) {
   const char* collector_reason = NULL;
@@ skipping 344 matching lines @@
 #ifdef DEBUG
   Isolate* isolate = Isolate::Current();
   isolate->heap()->disallow_allocation_failure_ = old_state_;
 #endif
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_HEAP_INL_H_