Rename WeakReference to WeakReferenceSet.

runtime/vm/scavenger.cc

Index: runtime/vm/scavenger.cc
diff --git a/runtime/vm/scavenger.cc b/runtime/vm/scavenger.cc
index 2344c711cb357e7eddb4d24678c49e5be73f7c26..412f2af32e11ad29eeb88164bbfc93c1fb979f47 100644
--- a/runtime/vm/scavenger.cc
+++ b/runtime/vm/scavenger.cc
@@ -379,25 +379,25 @@ void Scavenger::IterateWeakReferences(Isolate* isolate,
   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 scavenged.
-      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;
         }
       }
@@ -405,7 +405,7 @@ void Scavenger::IterateWeakReferences(Isolate* isolate,
       // delay queue.  This reference will be revisited if another
       // reference is scavenged.
       if (is_unreachable) {
-        state->DelayWeakReference(reference);
+        state->DelayWeakReferenceSet(reference_set);
       }
     }
     if ((resolved_top_ < top_) || PromotedStackHasMore()) {
@@ -416,11 +416,11 @@ void Scavenger::IterateWeakReferences(Isolate* isolate,
     }
   }
   // Deallocate any unreachable 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);
     }
   }
 }