Rehash canonical constants table for each class that can be affected by the 'become' operation

runtime/vm/isolate_reload.cc

 // Copyright (c) 2016, 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/isolate_reload.h"
 
 #include "vm/become.h"
 #include "vm/bit_vector.h"
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
@@ skipping 1138 matching lines @@
     const GrowableObjectArray& saved_libs =
         GrowableObjectArray::Handle(saved_libraries());
     const GrowableObjectArray& libs =
         GrowableObjectArray::Handle(I->object_store()->libraries());
     if (saved_libs.Length() != libs.Length()) {
       TIR_Print("Identity reload failed! B#L=%" Pd " A#L=%" Pd "\n",
                 saved_libs.Length(), libs.Length());
     }
   }
 
-  // Rehash constants map for all new classes and the closure class.
-  Class& cls = Class::Handle(zone_);
-  cls = I->class_table()->At(kClosureCid);
-  cls.RehashConstants(zone_);
-  {
-    ASSERT(class_map_storage_ != Array::null());
-    UnorderedHashMap<ClassMapTraits> map(class_map_storage_);
-    UnorderedHashMap<ClassMapTraits>::Iterator it(&map);
-    while (it.MoveNext()) {
-      const intptr_t entry = it.Current();
-      cls = Class::RawCast(map.GetKey(entry));
-      cls.RehashConstants(zone_);
-    }
-    map.Release();
-  }
+  // Rehash constants map for all classes.
+  RehashConstants();
 
 #ifdef DEBUG
   // Verify that all canonical instances are correctly setup in the
   // corresponding canonical tables.
   Thread* thread = Thread::Current();
   I->heap()->CollectAllGarbage();
   VerifyCanonicalVisitor check_canonical(thread);
   I->heap()->IterateObjects(&check_canonical);
 #endif  // DEBUG
 }
 
 
+void IsolateReloadContext::RehashConstants() {
+  ClassTable* class_table = I->class_table();
+  Class& cls = Class::Handle(zone_);
+  const intptr_t top = class_table->NumCids();
+  for (intptr_t cid = kInstanceCid; cid < top; cid++) {

[siva, 2016/11/15 22:58:22]

Should this be (kNumPredefinedCids + 1)

[rmacnak, 2016/11/15 23:13:33]

No, we still need to rehash array, growable array, map, etc.

+    if (!class_table->IsValidIndex(cid) || !class_table->HasValidClassAt(cid)) {

[siva, 2016/11/15 22:58:22]

IsValidIndex(cid) is implicit right with the check above,

maybe just

ASSERT(class_table->IsValidIndex(cid));

+      // Skip invalid classes.
+      continue;
+    }
+    if (RawObject::IsNumberClassId(cid) || RawObject::IsStringClassId(cid)) {
+      // Skip classes that cannot be affected by the 'become' operation.
+      continue;
+    }

[siva, 2016/11/15 22:58:22]

By running from kNumPredefinedCids this check for number and string woul
not be needed.

+    // Rehash constants.
+    cls = class_table->At(cid);
+    VTIR_Print("Rehashing constants in class `%s`\n", cls.ToCString());
+    cls.RehashConstants(zone_);
+  }
+}
+
+
 bool IsolateReloadContext::IsDirty(const Library& lib) {
   const intptr_t index = lib.index();
   if (index == static_cast<classid_t>(-1)) {
     // Treat deleted libraries as dirty.
     return true;
   }
   ASSERT((index >= 0) && (index < library_infos_.length()));
   return library_infos_[index].dirty;
 }
 
@@ skipping 499 matching lines @@
         ASSERT(!super_cls.IsNull());
         super_cls.AddDirectSubclass(cls);
       }
     }
   }
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart