Increase verbosity of assertion failures in SizeFromClass.

runtime/vm/raw_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/raw_object.h"
 
 #include "vm/class_table.h"
 #include "vm/dart.h"
 #include "vm/freelist.h"
 #include "vm/isolate.h"
@@ skipping 54 matching lines @@
 
 
 intptr_t RawObject::SizeFromClass() const {
   Isolate* isolate = Isolate::Current();
   NoHandleScope no_handles(isolate);
 
   // Only reasonable to be called on heap objects.
   ASSERT(IsHeapObject());
 
   intptr_t class_id = GetClassId();
-  RawClass* raw_class = isolate->class_table()->At(class_id);
+  ClassTable* class_table = isolate->class_table();
+#if defined(DEBUG)
+  if (!class_table->IsValidIndex(class_id) ||
+      !class_table->HasValidClassAt(class_id)) {
+    FATAL2("Invalid class id: %" Pd " from tags %" Px "\n",
+           class_id, ptr()->tags_);
+  }
+#endif  // DEBUG
+  RawClass* raw_class = class_table->At(class_id);
   ASSERT(raw_class->ptr()->id_ == class_id);
 
   // Get the instance size out of the class.
   intptr_t instance_size =
       raw_class->ptr()->instance_size_in_words_ << kWordSizeLog2;
 
   if (instance_size == 0) {
     switch (class_id) {
       case kCodeCid: {
         const RawCode* raw_code = reinterpret_cast<const RawCode*>(this);
@@ skipping 112 matching lines @@
         FreeListElement* element = reinterpret_cast<FreeListElement*>(addr);
         instance_size = element->Size();
         break;
       }
       default:
         UNREACHABLE();
         break;
     }
   }
   ASSERT(instance_size != 0);
+#if defined(DEBUG)
   uword tags = ptr()->tags_;
-  ASSERT((instance_size == SizeTag::decode(tags)) ||
-         (SizeTag::decode(tags) == 0));
+  intptr_t tags_size = SizeTag::decode(tags);
+  if ((instance_size != tags_size) && (tags_size != 0)) {
+    FATAL3("Size mismatch: %" Pd " vs %" Pd " from tags %" Px "\n",
+           instance_size, tags_size, tags);
+  }
+#endif  // DEBUG
   return instance_size;
 }
 
 
 #if defined(DEBUG)
 void RawObject::ValidateOverwrittenPointer(RawObject* raw) {
   if (FLAG_validate_overwrite) {
     raw->Validate(Isolate::Current());
   }
 }
@@ skipping 690 matching lines @@
 intptr_t RawUserTag::VisitUserTagPointers(
     RawUserTag* raw_obj, ObjectPointerVisitor* visitor) {
   // Make sure that we got here with the tagged pointer as this.
   ASSERT(raw_obj->IsHeapObject());
   visitor->VisitPointers(raw_obj->from(), raw_obj->to());
   return UserTag::InstanceSize();
 }
 
 
 }  // namespace dart