- Start adding meta data for fields of VM internal classes.

runtime/vm/heap_profiler.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/heap_profiler.h"
 
 #include "vm/dart_api_state.h"
 #include "vm/object.h"
 #include "vm/raw_object.h"
 #include "vm/stack_frame.h"
@@ skipping 504 matching lines @@
       RawField* raw_field =
           reinterpret_cast<RawField*>(raw_array->ptr()->data()[i]);
       if (Field::StaticBit::decode(raw_field->ptr()->kind_bits_)) {
         ++num_static_fields;
       } else {
         ++num_instance_fields;
       }
     }
   }
   // instance size (in bytes)
-  // TODO(cshapiro): properly account for variable sized objects
-  sub.Write32(raw_class->ptr()->instance_size_in_words_);
+  intptr_t instance_size_in_words = raw_class->ptr()->instance_size_in_words_;
+  if (instance_size_in_words == 0) {
+    // TODO(iposva): Better accounting of variable sized VM classes.
+    instance_size_in_words = num_instance_fields;
+  }
+  sub.Write32(instance_size_in_words * kWordSize);
   // size of constant pool and number of records that follow:
   sub.Write16(0);
   // Number of static fields
   sub.Write16(num_static_fields);
   // Static fields:
   if (raw_array != Array::null()) {
     for (intptr_t i = 0; i < Smi::Value(raw_array->ptr()->length_); ++i) {
       RawField* raw_field =
           reinterpret_cast<RawField*>(raw_array->ptr()->data()[i]);
       if (Field::StaticBit::decode(raw_field->ptr()->kind_bits_)) {
@@ skipping 178 matching lines @@
   RawObject* raw_obj = handle->raw();
   visitor_->VisitPointer(&raw_obj);
 }
 
 
 void HeapProfilerObjectVisitor::VisitObject(RawObject* raw_obj) {
   profiler_->WriteObject(raw_obj);
 }
 
 }  // namespace dart