Stop postponing instantiation of Type and remove InstantiatedType VM class.

runtime/vm/snapshot_test.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 "include/dart_debugger_api.h"
 #include "platform/assert.h"
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_api_message.h"
@@ skipping 480 matching lines @@
 
 
 TEST_CASE(SerializeSingletons) {
   // Write snapshot with object content.
   uint8_t* buffer;
   SnapshotWriter writer(Snapshot::kMessage, &buffer, &malloc_allocator);
   writer.WriteObject(Object::class_class());
   writer.WriteObject(Object::null_class());
   writer.WriteObject(Object::type_class());
   writer.WriteObject(Object::type_parameter_class());
-  writer.WriteObject(Object::instantiated_type_class());
-  writer.WriteObject(Object::abstract_type_arguments_class());
   writer.WriteObject(Object::type_arguments_class());
   writer.WriteObject(Object::instantiated_type_arguments_class());
   writer.WriteObject(Object::function_class());
   writer.WriteObject(Object::field_class());
   writer.WriteObject(Object::token_stream_class());
   writer.WriteObject(Object::script_class());
   writer.WriteObject(Object::library_class());
   writer.WriteObject(Object::code_class());
   writer.WriteObject(Object::instructions_class());
   writer.WriteObject(Object::pc_descriptors_class());
   writer.WriteObject(Object::exception_handlers_class());
   writer.WriteObject(Object::context_class());
   writer.WriteObject(Object::context_scope_class());
   writer.FinalizeBuffer();
 
   // Create a snapshot object using the buffer.
   const Snapshot* snapshot = Snapshot::SetupFromBuffer(buffer);
 
   // Read object back from the snapshot.
   SnapshotReader reader(snapshot, Isolate::Current());
   EXPECT(Object::class_class() == reader.ReadObject());
   EXPECT(Object::null_class() == reader.ReadObject());
   EXPECT(Object::type_class() == reader.ReadObject());
   EXPECT(Object::type_parameter_class() == reader.ReadObject());
-  EXPECT(Object::instantiated_type_class() == reader.ReadObject());
-  EXPECT(Object::abstract_type_arguments_class() == reader.ReadObject());
   EXPECT(Object::type_arguments_class() == reader.ReadObject());
   EXPECT(Object::instantiated_type_arguments_class() == reader.ReadObject());
   EXPECT(Object::function_class() == reader.ReadObject());
   EXPECT(Object::field_class() == reader.ReadObject());
   EXPECT(Object::token_stream_class() == reader.ReadObject());
   EXPECT(Object::script_class() == reader.ReadObject());
   EXPECT(Object::library_class() == reader.ReadObject());
   EXPECT(Object::code_class() == reader.ReadObject());
   EXPECT(Object::instructions_class() == reader.ReadObject());
   EXPECT(Object::pc_descriptors_class() == reader.ReadObject());
@@ skipping 993 matching lines @@
   EXPECT(Dart_ErrorHasException(result));
   EXPECT_SUBSTRING("Exception: nulltruefalse1234563.14[]100123456789\n",
                    Dart_GetError(result));
 
   Dart_ExitScope();
 }
 
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart