Changes to pass the current isolate to all runtime and native calls.

runtime/vm/scavenger.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/scavenger.h"
 
 #include "vm/dart.h"
+#include "vm/isolate.h"
 #include "vm/object.h"
 #include "vm/stack_frame.h"
 #include "vm/verifier.h"
 #include "vm/visitor.h"
 
 namespace dart {
 
 class ScavengerVisitor : public ObjectPointerVisitor {
  public:
   explicit ScavengerVisitor(Scavenger* scavenger)
@@ skipping 140 matching lines @@
 }
 
 
 void Scavenger::Epilogue() {
 #if defined(DEBUG)
   memset(from_->pointer(), 0xf3, from_->size());
 #endif  // defined(DEBUG)
 }
 
 
-void Scavenger::IterateRoots(ObjectPointerVisitor* visitor) {
-  Isolate::Current()->VisitObjectPointers(
-      visitor, StackFrameIterator::kDontValidateFrames);
+void Scavenger::IterateRoots(Isolate* isolate, ObjectPointerVisitor* visitor) {
+  isolate->VisitObjectPointers(visitor,
+                               StackFrameIterator::kDontValidateFrames);
   heap_->IterateOldPointers(visitor);
 }
 
 
 void Scavenger::ProcessToSpace(ObjectPointerVisitor* visitor) {
   uword resolved_top = FirstObjectStart();
   // Iterate until all work has been drained.
   while (resolved_top < top_) {
     RawObject* raw_obj = RawObject::FromAddr(resolved_top);
     resolved_top += raw_obj->VisitPointers(visitor);
   }
 }
 
 
 void Scavenger::VisitObjectPointers(ObjectPointerVisitor* visitor) const {
   uword cur = FirstObjectStart();
   while (cur < top_) {
     RawObject* raw_obj = RawObject::FromAddr(cur);
     cur += raw_obj->VisitPointers(visitor);
   }
 }
 
 
 void Scavenger::Scavenge() {
   // Scavenging is not reentrant. Make sure that is the case.
   ASSERT(!scavenging_);
   scavenging_ = true;
-  NoHandleScope no_handles;
+  Isolate* isolate = Isolate::Current();
+  NoHandleScope no_handles(isolate);
 
   Timer timer(FLAG_verbose_gc, "Scavenge");
   timer.Start();
   // Setup the visitor and run a scavenge.
   ScavengerVisitor visitor(this);
   Prologue();
-  IterateRoots(&visitor);
+  IterateRoots(isolate, &visitor);
   ProcessToSpace(&visitor);
   Epilogue();
   timer.Stop();
   if (FLAG_verbose_gc) {
     OS::PrintErr("Scavenge[%d]: %dus\n", count_, timer.TotalElapsedTime());
   }
 
   count_++;
   // Done scavenging. Reset the marker.
   ASSERT(scavenging_);
   scavenging_ = false;
 }
 
 }  // namespace dart