Ensure the classes void and dynamic have empty arrays for fields, functions, etc. Move their Types …

runtime/vm/snapshot.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/snapshot.h"
 
 #include "platform/assert.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
 #include "vm/class_finalizer.h"
@@ skipping 47 matching lines @@
   ASSERT((class_id > kIllegalCid) && (class_id < kNumPredefinedCids));
   ASSERT(!RawObject::IsTypedDataViewClassId(class_id));
   return (class_id + kClassIdsOffset);
 }
 
 
 static RawType* GetType(ObjectStore* object_store, int index) {
   switch (index) {
     case kObjectType: return object_store->object_type();
     case kNullType: return object_store->null_type();
-    case kDynamicType: return object_store->dynamic_type();
-    case kVoidType: return object_store->void_type();
     case kFunctionType: return object_store->function_type();
     case kNumberType: return object_store->number_type();
     case kSmiType: return object_store->smi_type();
     case kMintType: return object_store->mint_type();
     case kDoubleType: return object_store->double_type();
     case kIntType: return object_store->int_type();
     case kBoolType: return object_store->bool_type();
     case kStringType: return object_store->string_type();
     case kArrayType: return object_store->array_type();
     default: break;
   }
   UNREACHABLE();
   return Type::null();
 }
 
 
 static int GetTypeIndex(ObjectStore* object_store, const RawType* raw_type) {
   ASSERT(raw_type->IsHeapObject());
   if (raw_type == object_store->object_type()) {
     return kObjectType;
   } else if (raw_type == object_store->null_type()) {
     return kNullType;
-  } else if (raw_type == object_store->dynamic_type()) {
-    return kDynamicType;
-  } else if (raw_type == object_store->void_type()) {
-    return kVoidType;
   } else if (raw_type == object_store->function_type()) {
     return kFunctionType;
   } else if (raw_type == object_store->number_type()) {
     return kNumberType;
   } else if (raw_type == object_store->smi_type()) {
     return kSmiType;
   } else if (raw_type == object_store->mint_type()) {
     return kMintType;
   } else if (raw_type == object_store->double_type()) {
     return kDoubleType;
@@ skipping 613 matching lines @@
   if (object_id == kNullObject) {
     // This is a singleton null object, return it.
     return Object::null();
   }
   if (object_id == kSentinelObject) {
     return Object::sentinel().raw();
   }
   if (object_id == kEmptyArrayObject) {
     return Object::empty_array().raw();
   }
+  if (object_id == kDynamicType) {
+    return Object::dynamic_type();
+  }
+  if (object_id == kVoidType) {
+    return Object::void_type();
+  }
   if (object_id == kTrueValue) {
     return Bool::True().raw();
   }
   if (object_id == kFalseValue) {
     return Bool::False().raw();
   }
   intptr_t class_id = ClassIdFromObjectId(object_id);
   if (IsSingletonClassId(class_id)) {
     return isolate()->class_table()->At(class_id);  // get singleton class.
   } else {
@@ skipping 147 matching lines @@
     WriteVMIsolateObject(kSentinelObject);
     return;
   }
 
   // Check if it is a singleton empty array object.
   if (rawobj == Object::empty_array().raw()) {
     WriteVMIsolateObject(kEmptyArrayObject);
     return;
   }
 
+  // Check if it is a singleton dyanmic Type object.
+  if (rawobj == Object::dynamic_type()) {
+    WriteVMIsolateObject(kDynamicType);
+    return;
+  }
+
+  // Check if it is a singleton void Type object.
+  if (rawobj == Object::void_type()) {
+    WriteVMIsolateObject(kVoidType);
+    return;
+  }
+
   // Check if it is a singleton boolean true object.
   if (rawobj == Bool::True().raw()) {
     WriteVMIsolateObject(kTrueValue);
     return;
   }
 
   // Check if it is a singleton boolean false object.
   if (rawobj == Bool::False().raw()) {
     WriteVMIsolateObject(kFalseValue);
     return;
@@ skipping 567 matching lines @@
     UnmarkAll();
     isolate->set_long_jump_base(base);
   } else {
     isolate->set_long_jump_base(base);
     ThrowException(exception_type(), exception_msg());
   }
 }
 
 
 }  // namespace dart