Make ObjectGraph wait for concurrent sweeper before using mark bits

runtime/vm/object_graph.cc

 // Copyright (c) 2014, 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/object_graph.h"
 
 #include "vm/dart.h"
 #include "vm/growable_array.h"
 #include "vm/isolate.h"
 #include "vm/object.h"
@@ skipping 129 matching lines @@
  public:
   explicit Unmarker(Isolate* isolate) : ObjectVisitor(isolate) { }
 
   void VisitObject(RawObject* obj) {
     if (obj->IsMarked()) {
       obj->ClearMarkBit();
     }
   }
 
   static void UnmarkAll(Isolate* isolate) {
-    PageSpace* old_space = isolate->heap()->old_space();
-    MonitorLocker ml(old_space->tasks_lock());
-    while (old_space->tasks() > 0) {
-      ml.Wait();
-    }
     Unmarker unmarker(isolate);
     isolate->heap()->VisitObjects(&unmarker);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Unmarker);
 };
 
 
 ObjectGraph::ObjectGraph(Isolate* isolate)
     : StackResource(isolate) {
   // The VM isolate has all its objects pre-marked, so iterating over it
   // would be a no-op.
   ASSERT(isolate != Dart::vm_isolate());
   isolate->heap()->WriteProtectCode(false);
 }
 
 
 ObjectGraph::~ObjectGraph() {
   isolate()->heap()->WriteProtectCode(true);
 }
 
 
 void ObjectGraph::IterateObjects(ObjectGraph::Visitor* visitor) {
   NoSafepointScope no_safepoint_scope_;
+  PageSpace* old_space = isolate()->heap()->old_space();
+  MonitorLocker ml(old_space->tasks_lock());
+  while (old_space->tasks() > 0) {
+    ml.Wait();
+  }
   Stack stack(isolate());
   isolate()->VisitObjectPointers(&stack, false, false);
   stack.TraverseGraph(visitor);
   Unmarker::UnmarkAll(isolate());
 }
 
 
 void ObjectGraph::IterateObjectsFrom(const Object& root,
                                      ObjectGraph::Visitor* visitor) {
   NoSafepointScope no_safepoint_scope_;
+  PageSpace* old_space = isolate()->heap()->old_space();
+  MonitorLocker ml(old_space->tasks_lock());
+  while (old_space->tasks() > 0) {
+    ml.Wait();
+  }
   Stack stack(isolate());
   RawObject* root_raw = root.raw();
   stack.VisitPointer(&root_raw);
   stack.TraverseGraph(visitor);
   // TODO(koda): Optimize if we only visited a small subgraph.
   Unmarker::UnmarkAll(isolate());
 }
 
 
 class SizeVisitor : public ObjectGraph::Visitor {
@@ skipping 262 matching lines @@
   {
     WritePointerVisitor ptr_writer(isolate(), stream);
     isolate()->VisitObjectPointers(&ptr_writer, false, false);
   }
   stream->WriteUnsigned(0);
   IterateObjects(&visitor);
   return visitor.count() + 1;  // + root
 }
 
 }  // namespace dart