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

runtime/vm/gc_sweeper.cc

 // Copyright (c) 2011, 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/gc_sweeper.h"
 
 #include "vm/freelist.h"
 #include "vm/globals.h"
+#include "vm/heap.h"
+#include "vm/heap_trace.h"
 #include "vm/pages.h"
 
 namespace dart {
 
 intptr_t GCSweeper::SweepPage(HeapPage* page, FreeList* freelist) {
   // Keep track of the discovered live object sizes to be able to finish
   // sweeping early. Reset the per page in_use count for the next marking phase.
   intptr_t in_use_swept = 0;
   intptr_t in_use = page->used();
   page->set_used(0);
 
   // Whole page is empty. Do not enter anything into the freelist.
   if (in_use == 0) {
     return 0;
   }
 
   bool is_executable = (page->type() == HeapPage::kExecutable);
   uword current = page->object_start();
   uword end = page->object_end();
 
   while (current < end) {
     intptr_t obj_size;
-    if (in_use_swept == in_use) {
+    if (in_use_swept == in_use && !HeapTrace::is_enabled()) {
       // No more marked objects will be found on this page.
       obj_size = end - current;
       freelist->Free(current, obj_size);
       break;
     }
     RawObject* raw_obj = RawObject::FromAddr(current);
     if (raw_obj->IsMarked()) {
       // Found marked object. Clear the mark bit and update swept bytes.
       raw_obj->ClearMarkBit();
       obj_size = raw_obj->Size();
       in_use_swept += obj_size;
     } else {
       uword free_end = current + raw_obj->Size();
+      if (HeapTrace::is_enabled()) {
+        heap_->trace()->TraceSweep(current);
+      }
       while (free_end < end) {
         RawObject* next_obj = RawObject::FromAddr(free_end);
         if (next_obj->IsMarked()) {
           // Reached the end of the free block.
           break;
         }
+        if (HeapTrace::is_enabled()) {
+          heap_->trace()->TraceSweep(free_end);
+        }
         // Expand the free block by the size of this object.
         free_end += next_obj->Size();
       }
       obj_size = free_end - current;
       if (is_executable) {
         memset(reinterpret_cast<void*>(current), 0xcc, obj_size);
       }
       freelist->Free(current, obj_size);
     }
     current += obj_size;
   }
 
   return in_use_swept;
 }
 
 
 intptr_t GCSweeper::SweepLargePage(HeapPage* page) {
   RawObject* raw_obj = RawObject::FromAddr(page->object_start());
   if (!raw_obj->IsMarked()) {
+    if (HeapTrace::is_enabled()) {
+      heap_->trace()->TraceSweep(page->object_start());
+    }
     // The large object was not marked. Used size is zero, which also tells the
     // calling code that the large object page can be recycled.
     return 0;
   }
   raw_obj->ClearMarkBit();
   return raw_obj->Size();
 }
 
 }  // namespace dart