- Move

runtime/vm/store_buffer.cc

Index: runtime/vm/store_buffer.cc
diff --git a/runtime/vm/store_buffer.cc b/runtime/vm/store_buffer.cc
index cc0a8163a939ce6fecb0c450533a00829e156d32..b257c0aaf15ada53997e70a4969626bdfe6fe9d1 100644
--- a/runtime/vm/store_buffer.cc
+++ b/runtime/vm/store_buffer.cc
@@ -100,12 +100,13 @@ void StoreBuffer::PushBlock(Block* block, ThresholdPolicy policy) {
   BlockStack<Block::kSize>::PushBlockImpl(block);
   if ((policy == kCheckThreshold) && Overflowed()) {
     MutexLocker ml(mutex_);
-    Isolate* isolate = Isolate::Current();
+    Thread* thread = Thread::Current();
     // Sanity check: it makes no sense to schedule the GC in another isolate.
     // (If Isolate ever gets multiple store buffers, we should avoid this
     // coupling by passing in an explicit callback+parameter at construction.)
-    ASSERT(isolate->store_buffer() == this);
-    isolate->ScheduleInterrupts(Isolate::kVMInterrupt);
+    ASSERT(thread->isolate()->mutator_thread() == thread);
+    ASSERT(thread->isolate()->store_buffer() == this);
+    thread->ScheduleInterrupts(Thread::kVMInterrupt);
   }
 }