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

runtime/vm/zone.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/zone.h"
 
 #include "platform/assert.h"
 #include "platform/utils.h"
 #include "vm/flags.h"
+#include "vm/heap.h"
+#include "vm/heap_trace.h"
 #include "vm/isolate.h"
 #include "vm/os.h"
 
 namespace dart {
 
 DEFINE_DEBUG_FLAG(bool, trace_zone_sizes,
                   false, "Traces allocation sizes in the zone.");
 
 
 // Zone segments represent chunks of memory: They have starting
@@ skipping 64 matching lines @@
 #ifdef DEBUG
     // Zap the entire initial buffer.
   memset(initial_buffer_.pointer(), kZapUninitializedByte,
          initial_buffer_.size());
 #endif
 }
 
 
 Zone::~Zone() {
   DeleteAll();
+  if (HeapTrace::is_enabled()) {
+    Isolate* isolate = Isolate::Current();
+    isolate->heap()->trace()->TraceDeleteZone(this);
+  }
 #if defined(DEBUG)
   if (FLAG_trace_zone_sizes) {
     DumpZoneSizes();
   }
 #endif
 }
 
 
 void Zone::DeleteAll() {
   // Traverse the chained list of segments, zapping (in debug mode)
@@ skipping 134 matching lines @@
   va_list args2;
   va_start(args2, format);
   OS::VSNPrint(buffer, (len + 1), format, args2);
   va_end(args2);
 
   return buffer;
 }
 
 
 }  // namespace dart