VM: Refactor allocation stats code and remove duplicate code.

runtime/vm/class_table.h

 // 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.
 
 #ifndef VM_CLASS_TABLE_H_
 #define VM_CLASS_TABLE_H_
 
 #include "platform/assert.h"
 #include "vm/bitfield.h"
 #include "vm/globals.h"
@@ skipping 177 matching lines @@
   void UpdateAllocatedOld(intptr_t cid, intptr_t size);
 
   // Called whenever a old GC occurs.
   void ResetCountersOld();
   // Called whenever a new GC occurs.
   void ResetCountersNew();
   // Called immediately after a new GC.
   void UpdatePromoted();
 
   // Used by the generated code.
-  uword PredefinedClassHeapStatsTableAddress() {
-    return reinterpret_cast<uword>(predefined_class_heap_stats_table_);
-  }
+  static intptr_t ClassOffsetFor(intptr_t cid);
 
-  // Used by generated code.
-  uword ClassStatsTableAddress() {
-    return reinterpret_cast<uword>(&class_heap_stats_table_);
-  }
+  // Used by the generated code.
+  ClassHeapStats** TableAddressFor(intptr_t cid);
+  static intptr_t TableOffsetFor(intptr_t cid);
+
+  // Used by the generated code.
+  ClassHeapStats** CountAddressFor(intptr_t cid,
+                                   bool is_new_space,
+                                   intptr_t* offset);
+
+  // Used by the generated code.
+  ClassHeapStats** StateAddressFor(intptr_t cid,
+                                   intptr_t* offset);
+
+  // Used by the generated code.
+  static intptr_t SizeOffsetFor(intptr_t cid, bool is_new_space);
 
   ClassHeapStats* StatsWithUpdatedSize(intptr_t cid);
 
   void AllocationProfilePrintJSON(JSONStream* stream);
   void ResetAllocationAccumulators();
 
   // Deallocates table copies. Do not call during concurrent access to table.
   void FreeOldTables();
 
   void TraceAllocationsFor(intptr_t cid, bool trace);
@@ skipping 22 matching lines @@
   ClassHeapStats* PreliminaryStatsAt(intptr_t cid);
   void UpdateLiveOld(intptr_t cid, intptr_t size);
   void UpdateLiveNew(intptr_t cid, intptr_t size);
 
   DISALLOW_COPY_AND_ASSIGN(ClassTable);
 };
 
 }  // namespace dart
 
 #endif  // VM_CLASS_TABLE_H_