AOT: Reassign class ids so class hierarchies have contiguous ranges.

runtime/vm/class_table.cc

 // Copyright (c) 2012, 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/class_table.h"
 
 #include "vm/atomic.h"
 #include "vm/flags.h"
 #include "vm/freelist.h"
 #include "vm/growable_array.h"
@@ skipping 193 matching lines @@
 }
 
 
 #if defined(DEBUG)
 void ClassTable::Unregister(intptr_t index) {
   table_[index] = 0;
 }
 #endif
 
 
+#if defined(DART_PRECOMPILER)
+void ClassTable::Remap(intptr_t* old_to_new_cid) {
+  intptr_t num_cids = NumCids();
+  RawClass** cls_by_old_cid = new RawClass*[num_cids];
+  for (intptr_t i = 0; i < num_cids; i++) {
+    cls_by_old_cid[i] = table_[i];
+  }
+  for (intptr_t i = 0; i < num_cids; i++) {
+    table_[old_to_new_cid[i]] = cls_by_old_cid[i];
+  }
+  delete[] cls_by_old_cid;
+}
+#endif
+
+
 void ClassTable::VisitObjectPointers(ObjectPointerVisitor* visitor) {
   ASSERT(visitor != NULL);
   visitor->VisitPointers(reinterpret_cast<RawObject**>(&table_[0]), top_);
 }
 
 
 void ClassTable::Validate() {
   Class& cls = Class::Handle();
-  for (intptr_t i = kNumPredefinedCids; i < top_; i++) {
+  for (intptr_t cid = kNumPredefinedCids; cid < top_; cid++) {
     // Some of the class table entries maybe NULL as we create some
     // top level classes but do not add them to the list of anonymous
     // classes in a library if there are no top level fields or functions.
     // Since there are no references to these top level classes they are
     // not written into a full snapshot and will not be recreated when
     // we read back the full snapshot. These class slots end up with NULL
     // entries.
-    if (HasValidClassAt(i)) {
-      cls = At(i);
+    if (HasValidClassAt(cid)) {
+      cls = At(cid);
       ASSERT(cls.IsClass());
+      ASSERT(cls.id() == cid);
     }
   }
 }
 
 
 void ClassTable::Print() {
   Class& cls = Class::Handle();
   String& name = String::Handle();
 
   for (intptr_t i = 1; i < top_; i++) {
@@ skipping 337 matching lines @@
 void ClassTable::UpdateLiveNew(intptr_t cid, intptr_t size) {
   ClassHeapStats* stats = PreliminaryStatsAt(cid);
   ASSERT(stats != NULL);
   ASSERT(size >= 0);
   stats->post_gc.AddNew(size);
 }
 #endif  // !PRODUCT
 
 
 }  // namespace dart