Merge 6800:7180 from the bleeding edge branch to the experimental/gc branch.

src/mark-compact.cc

Index: src/mark-compact.cc
===================================================================
--- src/mark-compact.cc	(revision 7180)
+++ src/mark-compact.cc	(working copy)
@@ -1517,6 +1517,9 @@
   if (FLAG_flush_code) {
     FlushCode::ProcessCandidates();
   }
+
+  // Clean up dead objects from the runtime profiler.
+  RuntimeProfiler::RemoveDeadSamples();
 }
 
 
@@ -1851,6 +1854,9 @@
   // All pointers were updated. Update auxiliary allocation info.
   Heap::IncrementYoungSurvivorsCounter(survivors_size);
   space->set_age_mark(space->top());
+
+  // Update JSFunction pointers from the runtime profiler.
+  RuntimeProfiler::UpdateSamplesAfterScavenge();
 }
 
 
@@ -2243,12 +2249,6 @@
 #ifdef ENABLE_LOGGING_AND_PROFILING
   if (obj->IsCode()) {
     PROFILE(CodeDeleteEvent(obj->address()));
-  } else if (obj->IsJSFunction()) {
-    // TODO(gc): we are sweeping old pointer space conservatively thus
-    // we can't notify attached profiler about death of functions.
-    // Consider disabling conservative sweeping when profiler
-    // is enabled.
-    PROFILE(FunctionDeleteEvent(obj->address()));
   }
 #endif
 }