Fix allocation stats bug on ARM; add unit test.

runtime/vm/class_table.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/class_table.h"
 #include "vm/flags.h"
 #include "vm/freelist.h"
 #include "vm/heap.h"
 #include "vm/object.h"
 #include "vm/raw_object.h"
@@ skipping 194 matching lines @@
   post_gc.Reset();
   recent.Reset();
   accumulated.Reset();
   last_reset.Reset();
   promoted_count = 0;
   promoted_size = 0;
 }
 
 
 void ClassHeapStats::ResetAtNewGC() {
+  Verify();
   pre_gc.new_count = post_gc.new_count + recent.new_count;
   pre_gc.new_size = post_gc.new_size + recent.new_size;
   // Accumulate allocations.
   accumulated.new_count += recent.new_count - last_reset.new_count;
   accumulated.new_size += recent.new_size - last_reset.new_size;
   last_reset.ResetNew();
   post_gc.ResetNew();
   recent.ResetNew();
   old_pre_new_gc_count_ = recent.old_count;
   old_pre_new_gc_size_ = recent.old_size;
 }
 
 
 void ClassHeapStats::ResetAtOldGC() {
+  Verify();
   pre_gc.old_count = post_gc.old_count + recent.old_count;
   pre_gc.old_size = post_gc.old_size + recent.old_size;
   // Accumulate allocations.
   accumulated.old_count += recent.old_count - last_reset.old_count;
   accumulated.old_size += recent.old_size - last_reset.old_size;
   last_reset.ResetOld();
   post_gc.ResetOld();
   recent.ResetOld();
 }
 
 
+void ClassHeapStats::Verify() {
+  pre_gc.Verify();
+  post_gc.Verify();
+  recent.Verify();
+  accumulated.Verify();
+  last_reset.Verify();
+}
+
+
 void ClassHeapStats::UpdateSize(intptr_t instance_size) {
   pre_gc.UpdateSize(instance_size);
   post_gc.UpdateSize(instance_size);
   recent.UpdateSize(instance_size);
   accumulated.UpdateSize(instance_size);
   last_reset.UpdateSize(instance_size);
   promoted_size = promoted_count * instance_size;
   old_pre_new_gc_size_ = old_pre_new_gc_count_ * instance_size;
 }
 
@@ skipping 88 matching lines @@
   }
   Class& cls = Class::Handle(At(cid));
   if (!(cls.is_finalized() || cls.is_prefinalized())) {
     // Not finalized.
     return NULL;
   }
   ClassHeapStats* stats = PreliminaryStatsAt(cid);
   if (ShouldUpdateSizeForClassId(cid)) {
     stats->UpdateSize(cls.instance_size());
   }
+  stats->Verify();
   return stats;
 }
 
 
 void ClassTable::ResetCountersOld() {
   for (intptr_t i = 0; i < kNumPredefinedCids; i++) {
     predefined_class_heap_stats_table_[i].ResetAtOldGC();
   }
   for (intptr_t i = kNumPredefinedCids; i < top_; i++) {
     class_heap_stats_table_[i].ResetAtOldGC();
@@ skipping 82 matching lines @@
 
 void ClassTable::UpdateLiveNew(intptr_t cid, intptr_t size) {
   ClassHeapStats* stats = PreliminaryStatsAt(cid);
   ASSERT(stats != NULL);
   ASSERT(size >= 0);
   stats->post_gc.AddNew(size);
 }
 
 
 }  // namespace dart