Update survival statistics correctly in the Scavenger.

src/heap.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/v8.h"
 
 #include "src/accessors.h"
 #include "src/api.h"
 #include "src/base/once.h"
 #include "src/bootstrapper.h"
@@ skipping 2007 matching lines @@
           }
         }
 
         heap->IncrementPromotedObjectsSize(object_size);
         return;
       }
     }
     ASSERT(heap->AllowedToBeMigrated(object, NEW_SPACE));
     AllocationResult allocation =
         heap->new_space()->AllocateRaw(allocation_size);
     heap->promotion_queue()->SetNewLimit(heap->new_space()->top());

[Igor Sheludko, 2014/06/24 15:12:38]

Shouldn't limit updating be done only if the allocation succeeded?

It would be really great to merge both ShouldBePromoted() and else cases.

[Hannes Payer (out of office), 2014/06/24 16:28:15]

I changed the order, WDYT?

 
     // Allocation in the other semi-space may fail due to fragmentation.
     // In that case we allocate in the old generation.
     if (allocation.IsRetry()) {
       if (object_contents == DATA_OBJECT) {
         ASSERT(heap->AllowedToBeMigrated(object, OLD_DATA_SPACE));
         allocation = heap->old_data_space()->AllocateRaw(allocation_size);
       } else {
         ASSERT(heap->AllowedToBeMigrated(object, OLD_POINTER_SPACE));
         allocation = heap->old_pointer_space()->AllocateRaw(allocation_size);
       }
+      heap->IncrementPromotedObjectsSize(object_size);
+    } else {
+      heap->IncrementSemiSpaceCopiedObjectSize(object_size);
     }
 
     HeapObject* target = HeapObject::cast(allocation.ToObjectChecked());
 
     if (alignment != kObjectAlignment) {
       target = EnsureDoubleAligned(heap, target, allocation_size);
     }
 
     // Order is important: slot might be inside of the target if target
     // was allocated over a dead object and slot comes from the store
     // buffer.
     *slot = target;
     MigrateObject(heap, object, target, object_size);
-    heap->IncrementSemiSpaceCopiedObjectSize(object_size);
     return;
   }
 
 
   static inline void EvacuateJSFunction(Map* map,
                                         HeapObject** slot,
                                         HeapObject* object) {
     ObjectEvacuationStrategy<POINTER_OBJECT>::
         template VisitSpecialized<JSFunction::kSize>(map, slot, object);
 
@@ skipping 4306 matching lines @@
       static_cast<int>(object_sizes_last_time_[index]));
   CODE_AGE_LIST_COMPLETE(ADJUST_LAST_TIME_OBJECT_COUNT)
 #undef ADJUST_LAST_TIME_OBJECT_COUNT
 
   MemCopy(object_counts_last_time_, object_counts_, sizeof(object_counts_));
   MemCopy(object_sizes_last_time_, object_sizes_, sizeof(object_sizes_));
   ClearObjectStats();
 }
 
 } }  // namespace v8::internal