Attempts to fix bugs introduced in 8b6fcf50e85d.

runtime/vm/scavenger.cc

Index: runtime/vm/scavenger.cc
diff --git a/runtime/vm/scavenger.cc b/runtime/vm/scavenger.cc
index 32d62e000906025ed067aaa6032adfd2f326b1a0..0216be92f44e6dd7dc401d328504720d5d83dfd1 100644
--- a/runtime/vm/scavenger.cc
+++ b/runtime/vm/scavenger.cc
@@ -394,13 +394,6 @@ SemiSpace* Scavenger::Prologue(Isolate* isolate, bool invoke_api_callbacks) {
   resolved_top_ = top_;
   end_ = to_->end();
 
-  // Throw out the old information about the from space
-  if (isolate->IsMutatorThreadScheduled()) {
-    Thread* mutator_thread = isolate->mutator_thread();
-    mutator_thread->set_top(top_);
-    mutator_thread->set_end(end_);
-  }
-
   return from;
 }
 
@@ -410,12 +403,11 @@ void Scavenger::Epilogue(Isolate* isolate,
   // All objects in the to space have been copied from the from space at this
   // moment.
 
-  // Ensure the mutator thread now has the up-to-date top_ and end_ of the
-  // semispace
+  // Ensure the mutator thread will fail the next allocation. This will force
+  // mutator to allocate a new TLAB
   if (isolate->IsMutatorThreadScheduled()) {
-    Thread* thread = isolate->mutator_thread();
-    thread->set_top(top_);
-    thread->set_end(end_);
+    Thread* mutator_thread = isolate->mutator_thread();
+    ASSERT(!mutator_thread->HasActiveTLAB());
   }
 
   double avg_frac = stats_history_.Get(0).PromoCandidatesSuccessFraction();
@@ -722,31 +714,50 @@ void Scavenger::ProcessWeakReferences() {
   }
 }
 
-void Scavenger::FlushTLS() const {
+uword Scavenger::FlushTLS() const {
   ASSERT(heap_ != NULL);
-  if (heap_->isolate()->IsMutatorThreadScheduled()) {
+  uword saved_top = top_;
+  if (heap_->isolate()->IsMutatorThreadScheduled() && !scavenging_) {
     Thread* mutator_thread = heap_->isolate()->mutator_thread();
-    mutator_thread->heap()->new_space()->set_top(mutator_thread->top());
+    saved_top = mutator_thread->heap()->new_space()->top();
+    if (mutator_thread->HasActiveTLAB()) {
+      ASSERT(mutator_thread->top() <=
+             mutator_thread->heap()->new_space()->top());
+      heap_->FillRemainingTLAB(mutator_thread);
+    }
   }
+  return saved_top;
+}
+
+void Scavenger::UnflushTLS(uword value) const {

[rmacnak, 2017/08/04 23:02:15]

This only contains asserts now. Remove to rename to something that doesn't
suggest it has a side-effect.

+  ASSERT(heap_ != NULL);
+#if defined(DEBUG)
+  if (heap_->isolate()->IsMutatorThreadScheduled() && !scavenging_) {
+    Thread* mutator_thread = heap_->isolate()->mutator_thread();
+    ASSERT(mutator_thread->top() <= mutator_thread->heap()->new_space()->top());
+  }
+#endif  // defined(DEBUG)
 }
 
 void Scavenger::VisitObjectPointers(ObjectPointerVisitor* visitor) const {
-  FlushTLS();
+  uword saved_top = FlushTLS();
   uword cur = FirstObjectStart();
   while (cur < top_) {
     RawObject* raw_obj = RawObject::FromAddr(cur);
     cur += raw_obj->VisitPointers(visitor);
   }
+  UnflushTLS(saved_top);
 }
 
 void Scavenger::VisitObjects(ObjectVisitor* visitor) const {
-  FlushTLS();
+  uword saved_top = FlushTLS();
   uword cur = FirstObjectStart();
   while (cur < top_) {
     RawObject* raw_obj = RawObject::FromAddr(cur);
     visitor->VisitObject(raw_obj);
     cur += raw_obj->Size();
   }
+  UnflushTLS(saved_top);
 }
 
 void Scavenger::AddRegionsToObjectSet(ObjectSet* set) const {
@@ -755,19 +766,21 @@ void Scavenger::AddRegionsToObjectSet(ObjectSet* set) const {
 
 RawObject* Scavenger::FindObject(FindObjectVisitor* visitor) const {
   ASSERT(!scavenging_);
-  FlushTLS();
+  uword saved_top = FlushTLS();
   uword cur = FirstObjectStart();
   if (visitor->VisitRange(cur, top_)) {
     while (cur < top_) {
       RawObject* raw_obj = RawObject::FromAddr(cur);
       uword next = cur + raw_obj->Size();
       if (visitor->VisitRange(cur, next) && raw_obj->FindObject(visitor)) {
+        UnflushTLS(saved_top);
         return raw_obj;  // Found object, return it.
       }
       cur = next;
     }
     ASSERT(cur == top_);
   }
+  UnflushTLS(saved_top);
   return Object::null();
 }
 
@@ -802,6 +815,13 @@ void Scavenger::Scavenge(bool invoke_api_callbacks) {
   int64_t post_safe_point = OS::GetCurrentMonotonicMicros();
   heap_->RecordTime(kSafePoint, post_safe_point - pre_safe_point);
 
+  if (isolate->IsMutatorThreadScheduled()) {
+    Thread* mutator_thread = isolate->mutator_thread();
+    if (mutator_thread->HasActiveTLAB()) {
+      heap_->AbandonRemainingTLAB(mutator_thread);
+    }
+  }
+
   // TODO(koda): Make verification more compatible with concurrent sweep.
   if (FLAG_verify_before_gc && !FLAG_concurrent_sweep) {
     OS::PrintErr("Verifying before Scavenge...");
@@ -913,11 +933,6 @@ void Scavenger::Evacuate() {
   // Forces the next scavenge to promote all the objects in the new space.
   survivor_end_ = top_;
 
-  if (heap_->isolate()->IsMutatorThreadScheduled()) {
-    Thread* mutator_thread = heap_->isolate()->mutator_thread();
-    survivor_end_ = mutator_thread->top();
-  }
-
   Scavenge();
 
   // It is possible for objects to stay in the new space
@@ -925,4 +940,9 @@ void Scavenger::Evacuate() {
   ASSERT((UsedInWords() == 0) || failed_to_promote_);
 }
 
+int64_t Scavenger::UsedInWords() const {
+  int64_t used_in_words = (top_ - FirstObjectStart()) >> kWordSizeLog2;
+  return used_in_words;
+}
+
 }  // namespace dart