Merge the Merlin heap tracing to top-of-trunk.

runtime/vm/raw_object.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_RAW_OBJECT_H_
 #define VM_RAW_OBJECT_H_
 
 #include "platform/assert.h"
 #include "vm/globals.h"
 #include "vm/token.h"
@@ skipping 372 matching lines @@
     return ClassIdTag::decode(tags);
   }
 
   friend class Api;
   friend class Array;
   friend class FreeListElement;
   friend class GCMarker;
   friend class Heap;
   friend class HeapProfiler;
   friend class HeapProfilerRootVisitor;
+  friend class HeapTrace;
+  friend class HeapTraceDebugObjectVisitor;
+  friend class HeapTraceHandleVisitor;
+  friend class HeapTraceVisitor;
   friend class MarkingVisitor;
   friend class Object;
   friend class RawInstructions;
   friend class RawInstance;
   friend class Scavenger;
   friend class SnapshotReader;
   friend class SnapshotWriter;
   friend class String;
 
   DISALLOW_ALLOCATION();
@@ skipping 33 matching lines @@
 
   cpp_vtable handle_vtable_;
   intptr_t instance_size_in_words_;  // Size if fixed len or 0 if variable len.
   intptr_t id_;  // Class Id, also index in the class table.
   intptr_t type_arguments_field_offset_in_words_;  // Offset of type args fld.
   intptr_t next_field_offset_in_words_;  // Offset of the next instance field.
   intptr_t num_native_fields_;  // Number of native fields in class.
   intptr_t token_pos_;
   uint8_t state_bits_;  // state, is_const, is_implemented.
 
+  friend class HeapTrace;
   friend class Instance;
   friend class Object;
   friend class RawInstance;
   friend class RawInstructions;
   friend class SnapshotReader;
 };
 
 
 class RawUnresolvedClass : public RawObject {
   RAW_HEAP_OBJECT_IMPLEMENTATION(UnresolvedClass);
@@ skipping 672 matching lines @@
 
 
 class RawString : public RawInstance {
   RAW_HEAP_OBJECT_IMPLEMENTATION(String);
 
  protected:
   RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->length_); }
   RawSmi* length_;
   RawSmi* hash_;
   RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->hash_); }
+
+  friend class HeapTrace;
 };
 
 
 class RawOneByteString : public RawString {
   RAW_HEAP_OBJECT_IMPLEMENTATION(OneByteString);
 
   // Variable length data follows here.
   uint8_t data_[0];
 
+  friend class ApiMessageReader;
+  friend class HeapTrace;
   friend class SnapshotReader;
-  friend class ApiMessageReader;
 };
 
 
 class RawTwoByteString : public RawString {
   RAW_HEAP_OBJECT_IMPLEMENTATION(TwoByteString);
 
   // Variable length data follows here.
   uint16_t data_[0];
 
+  friend class HeapTrace;
   friend class SnapshotReader;
 };
 
 
 template<typename T>
 class ExternalStringData {
  public:
   ExternalStringData(const T* data, void* peer, Dart_PeerFinalizer callback) :
       data_(data), peer_(peer), callback_(callback) {
   }
@@ skipping 59 matching lines @@
   friend class RawImmutableArray;
   friend class SnapshotReader;
   friend class GrowableObjectArray;
   friend class Object;
 };
 
 
 class RawImmutableArray : public RawArray {
   RAW_HEAP_OBJECT_IMPLEMENTATION(ImmutableArray);
 
+  friend class HeapTrace;
   friend class SnapshotReader;
 };
 
 
 class RawGrowableObjectArray : public RawInstance {
   RAW_HEAP_OBJECT_IMPLEMENTATION(GrowableObjectArray);
 
   RawObject** from() {
     return reinterpret_cast<RawObject**>(&ptr()->type_arguments_);
   }
@@ skipping 426 matching lines @@
          kExternalUint64ArrayCid == kExternalInt8ArrayCid + 8 &&
          kExternalFloat32ArrayCid == kExternalInt8ArrayCid + 9 &&
          kExternalFloat64ArrayCid == kExternalInt8ArrayCid + 10 &&
          kStacktraceCid == kExternalInt8ArrayCid + 11);
   return (index >= kExternalInt8ArrayCid && index <= kExternalFloat64ArrayCid);
 }
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_