Renaming type classes as discussed:

runtime/vm/raw_object_snapshot.cc

 // Copyright (c) 2011, 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/bigint_operations.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/snapshot.h"
 #include "vm/visitor.h"
 
@@ skipping 122 matching lines @@
   writer->WriteObjectHeader(kObjectId, Object::kUnresolvedClassClass);
 
   // Write out all the non object pointer fields.
   writer->Write<intptr_t>(ptr()->token_index_);
 
   // Write out all the object pointer fields.
   visitor.VisitPointers(from(), to());
 }
 
 
+RawAbstractType* AbstractType::ReadFrom(SnapshotReader* reader,
+                        intptr_t object_id,
+                        bool classes_serialized) {
+  UNREACHABLE();  // AbstractType is an abstract class.
+  return NULL;
+}
+
+
+void RawAbstractType::WriteTo(SnapshotWriter* writer,
+                      intptr_t object_id,
+                      bool serialize_classes) {
+  UNREACHABLE();  // AbstractType is an abstract class.
+}
+
+
 RawType* Type::ReadFrom(SnapshotReader* reader,
-                        intptr_t object_id,
-                        bool classes_serialized) {
-  UNREACHABLE();  // Type is an abstract class.
-  return NULL;
-}
-
-
-void RawType::WriteTo(SnapshotWriter* writer,
-                      intptr_t object_id,
-                      bool serialize_classes) {
-  UNREACHABLE();  // Type is an abstract class.
-}
-
-
-RawParameterizedType* ParameterizedType::ReadFrom(SnapshotReader* reader,
                                                   intptr_t object_id,
                                                   bool classes_serialized) {
   ASSERT(reader != NULL);
 
   // Allocate parameterized type object.
-  ParameterizedType& parameterized_type =
-      ParameterizedType::ZoneHandle(ParameterizedType::New());
+  Type& parameterized_type = Type::ZoneHandle(Type::New());
   reader->AddBackwardReference(object_id, &parameterized_type);
 
   // Set all non object fields.
   parameterized_type.set_type_state(reader->Read<int8_t>());
 
   // Set all the object fields.
   // TODO(5411462): Need to assert No GC can happen here, even though
   // allocations may happen.
   intptr_t num_flds = (parameterized_type.raw()->to() -
                        parameterized_type.raw()->from());
   for (intptr_t i = 0; i <= num_flds; i++) {
     *(parameterized_type.raw()->from() + i) = reader->ReadObject();
   }
   return parameterized_type.raw();
 }
 
 
-void RawParameterizedType::WriteTo(SnapshotWriter* writer,
+void RawType::WriteTo(SnapshotWriter* writer,
                                    intptr_t object_id,
                                    bool serialize_classes) {
   ASSERT(writer != NULL);
   SnapshotWriterVisitor visitor(writer);
 
   // Write out the serialization header value for this object.
   writer->WriteObjectHeader(kInlined, object_id);
 
   // Write out the class information.
-  writer->WriteObjectHeader(kObjectId, Object::kParameterizedTypeClass);
+  writer->WriteObjectHeader(kObjectId, Object::kTypeClass);
 
   // Write out all the non object pointer fields.
   writer->Write<int8_t>(ptr()->type_state_);
 
   // Write out all the object pointer fields.
   visitor.VisitPointers(from(), to());
 }
 
 
 RawTypeParameter* TypeParameter::ReadFrom(SnapshotReader* reader,
@@ skipping 99 matching lines @@
                                   intptr_t object_id,
                                   bool classes_serialized) {
   ASSERT(reader != NULL);
 
   // Read the length so that we can determine instance size to allocate.
   RawSmi* smi_len = GetSmi(reader->Read<intptr_t>());
   intptr_t len = Smi::Value(smi_len);
 
   TypeArray& type_array = TypeArray::Handle(TypeArray::New(len));
   reader->AddBackwardReference(object_id, &type_array);
-  Type& type = Type::Handle();
+  AbstractType& type = AbstractType::Handle();
   for (intptr_t i = 0; i < len; i++) {
     type ^= reader->ReadObject();
     type_array.SetTypeAt(i, type);
   }
   return type_array.raw();
 }
 
 
 void RawTypeArray::WriteTo(SnapshotWriter* writer,
                            intptr_t object_id,
@@ skipping 1061 matching lines @@
   // Write out all the other fields.
   writer->Write<RawObject*>(ptr()->num_bracket_expressions_);
   writer->WriteObject(ptr()->pattern_);
   writer->Write<intptr_t>(ptr()->type_);
   writer->Write<intptr_t>(ptr()->flags_);
 
   // Do not write out the data part which is native.
 }
 
 }  // namespace dart