Move verification of builtin_vtables into Dart::InitializeIsolate.

runtime/vm/object.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/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
@@ skipping 524 matching lines @@
     tags = RawObject::SizeTag::update(leftover_size, tags);
     tags = RawObject::ClassIdTag::update(kInt8ArrayCid, tags);
     raw->ptr()->tags_ = tags;
     intptr_t leftover_len = (leftover_size - Int8Array::InstanceSize(0));
     ASSERT(Int8Array::InstanceSize(leftover_len) == leftover_size);
     raw->ptr()->length_ = Smi::New(leftover_len);
   }
 }
 
 
+void Object::VerifyBuiltinVtables() {
+#if defined(DEBUG)
+  Isolate* isolate = Isolate::Current();
+  ASSERT(isolate != NULL);
+  Class& cls = Class::Handle(isolate, Class::null());
+  for (intptr_t cid = (kIllegalCid + 1); cid < kNumPredefinedCids; cid++) {
+    if (isolate->class_table()->HasValidClassAt(cid)) {
+      cls |= isolate->class_table()->At(cid);
+      ASSERT(builtin_vtables_[cid] == cls.raw_ptr()->handle_vtable_);
+    }
+  }
+#endif
+}
+
+
 void Object::RegisterClass(const Class& cls,
                            const String& name,
                            const Library& lib) {
   ASSERT(name.Length() > 0);
   ASSERT(name.CharAt(0) != '_');
   cls.set_name(name);
   lib.AddClass(cls);
 }
 
 
@@ skipping 637 matching lines @@
   if (raw_ != Object::null()) {
     if ((reinterpret_cast<uword>(raw_) & kSmiTagMask) == kSmiTag) {
       ASSERT(vtable() == Smi::handle_vtable_);
       return;
     }
     intptr_t cid = raw_->GetClassId();
     if (cid >= kNumPredefinedCids) {
       cid = kInstanceCid;
     }
     ASSERT(vtable() == builtin_vtables_[cid]);
-    Isolate* isolate = Isolate::Current();
     if (FLAG_verify_handles) {
+      Isolate* isolate = Isolate::Current();
       Heap* isolate_heap = isolate->heap();
       Heap* vm_isolate_heap = Dart::vm_isolate()->heap();
       ASSERT(isolate_heap->Contains(RawObject::ToAddr(raw_)) ||
              vm_isolate_heap->Contains(RawObject::ToAddr(raw_)));
     }
-    ASSERT(builtin_vtables_[cid] ==
-           isolate->class_table()->At(cid)->ptr()->handle_vtable_);
   }
 #endif
 }
 
 
 RawObject* Object::Allocate(intptr_t cls_id,
                             intptr_t size,
                             Heap::Space space) {
   ASSERT(Utils::IsAligned(size, kObjectAlignment));
   Isolate* isolate = Isolate::Current();
@@ skipping 11400 matching lines @@
   }
   return result.raw();
 }
 
 
 const char* WeakProperty::ToCString() const {
   return "_WeakProperty";
 }
 
 }  // namespace dart