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

runtime/vm/object_store.h

 // 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.
 
 #ifndef VM_OBJECT_STORE_H_
 #define VM_OBJECT_STORE_H_
 
 #include "vm/object.h"
 
 namespace dart {
@@ skipping 43 matching lines @@
     ASSERT(null_class_ != Object::null());
     return null_class_;
   }
   void set_null_class(const Class& value) { null_class_ = value.raw(); }
 
   RawType* null_type() const { return null_type_; }
   void set_null_type(const Type& value) {
     null_type_ = value.raw();
   }
 
-  RawType* dynamic_type() const { return dynamic_type_; }
-  void set_dynamic_type(const Type& value) {
-    dynamic_type_ = value.raw();
-  }
-
-  RawType* void_type() const { return void_type_; }
-  void set_void_type(const Type& value) {
-    void_type_ = value.raw();
-  }
-
   RawType* function_type() const { return function_type_; }
   void set_function_type(const Type& value) {
     function_type_ = value.raw();
   }
 
   RawClass* type_class() const { return type_class_; }
   void set_type_class(const Class& value) { type_class_ = value.raw(); }
 
   RawClass* type_parameter_class() const { return type_parameter_class_; }
   void set_type_parameter_class(const Class& value) {
@@ skipping 344 matching lines @@
   static void Init(Isolate* isolate);
 
  private:
   ObjectStore();
 
   RawObject** from() { return reinterpret_cast<RawObject**>(&object_class_); }
   RawClass* object_class_;
   RawType* object_type_;
   RawClass* null_class_;
   RawType* null_type_;
-  RawType* dynamic_type_;
-  RawType* void_type_;
   RawType* function_type_;
   RawClass* type_class_;
   RawClass* type_parameter_class_;
   RawClass* bounded_type_class_;
   RawClass* mixin_app_type_class_;
   RawType* number_type_;
   RawType* int_type_;
   RawClass* integer_implementation_class_;
   RawClass* smi_class_;
   RawType* smi_type_;
@@ skipping 54 matching lines @@
   RawObject** to() { return reinterpret_cast<RawObject**>(&keyword_symbols_); }
 
   friend class SnapshotReader;
 
   DISALLOW_COPY_AND_ASSIGN(ObjectStore);
 };
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_STORE_H_