Rename WeakReference to WeakReferenceSet.

runtime/vm/gc_marker.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/gc_marker.h"
 
 #include "vm/allocation.h"
 #include "vm/dart_api_state.h"
 #include "vm/isolate.h"
 #include "vm/pages.h"
@@ skipping 248 matching lines @@
   isolate->VisitWeakPersistentHandles(visitor,
                                       visit_prologue_weak_persistent_handles);
 }
 
 
 void GCMarker::IterateWeakReferences(Isolate* isolate,
                                      MarkingVisitor* visitor) {
   ApiState* state = isolate->api_state();
   ASSERT(state != NULL);
   while (true) {
-    WeakReference* queue = state->delayed_weak_references();
+    WeakReferenceSet* queue = state->delayed_weak_reference_sets();
     if (queue == NULL) {
       // The delay queue is empty therefore no clean-up is required.
       return;
     }
-    state->set_delayed_weak_references(NULL);
+    state->set_delayed_weak_reference_sets(NULL);
     while (queue != NULL) {
-      WeakReference* reference = WeakReference::Pop(&queue);
-      ASSERT(reference != NULL);
+      WeakReferenceSet* reference_set = WeakReferenceSet::Pop(&queue);
+      ASSERT(reference_set != NULL);
       bool is_unreachable = true;
       // Test each key object for reachability.  If a key object is
       // reachable, all value objects should be marked.
-      for (intptr_t k = 0; k < reference->num_keys(); ++k) {
-        if (!IsUnreachable(*reference->get_key(k))) {
-          for (intptr_t v = 0; v < reference->num_values(); ++v) {
-            visitor->VisitPointer(reference->get_value(v));
+      for (intptr_t k = 0; k < reference_set->num_keys(); ++k) {
+        if (!IsUnreachable(*reference_set->get_key(k))) {
+          for (intptr_t v = 0; v < reference_set->num_values(); ++v) {
+            visitor->VisitPointer(reference_set->get_value(v));
           }
           is_unreachable = false;
-          delete reference;
+          delete reference_set;
           break;
         }
       }
       // If all key objects are unreachable put the reference on a
       // delay queue.  This reference will be revisited if another
       // reference is marked.
       if (is_unreachable) {
-        state->DelayWeakReference(reference);
+        state->DelayWeakReferenceSet(reference_set);
       }
     }
     if (!visitor->marking_stack()->IsEmpty()) {
       DrainMarkingStack(isolate, visitor);
     } else {
       // Break out of the loop if there has been no forward process.
       break;
     }
   }
   // Deallocate any unmarked references on the delay queue.
-  if (state->delayed_weak_references() != NULL) {
-    WeakReference* queue = state->delayed_weak_references();
-    state->set_delayed_weak_references(NULL);
+  if (state->delayed_weak_reference_sets() != NULL) {
+    WeakReferenceSet* queue = state->delayed_weak_reference_sets();
+    state->set_delayed_weak_reference_sets(NULL);
     while (queue != NULL) {
-      delete WeakReference::Pop(&queue);
+      delete WeakReferenceSet::Pop(&queue);
     }
   }
 }
 
 
 void GCMarker::DrainMarkingStack(Isolate* isolate,
                                  MarkingVisitor* visitor) {
   visitor->set_update_store_buffers(true);
   while (!visitor->marking_stack()->IsEmpty()) {
     RawObject* raw_obj = visitor->marking_stack()->Pop();
@@ skipping 11 matching lines @@
   MarkingVisitor mark(isolate, heap_, page_space, &marking_stack);
   IterateRoots(isolate, &mark, !invoke_api_callbacks);
   DrainMarkingStack(isolate, &mark);
   IterateWeakReferences(isolate, &mark);
   MarkingWeakVisitor mark_weak;
   IterateWeakRoots(isolate, &mark_weak, invoke_api_callbacks);
   Epilogue(isolate, invoke_api_callbacks);
 }
 
 }  // namespace dart