Canonicalize generic types in an isolate specific hash table

runtime/vm/object_reload.cc

 // Copyright (c) 2016, 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/object.h"
 
 #include "vm/isolate_reload.h"
 #include "vm/log.h"
 #include "vm/resolver.h"
 #include "vm/symbols.h"
@@ skipping 134 matching lines @@
   if (old_constants.IsNull() || old_constants.Length() == 0) {
     return;
   }
   TIR_Print("Copied %" Pd " canonical constants for class `%s`\n",
             old_constants.Length(),
             ToCString());
   set_constants(old_constants);
 }
 
 
-void Class::CopyCanonicalTypes(const Class& old_cls) const {
-  const Object& old_canonical_types = Object::Handle(old_cls.canonical_types());
-  if (old_canonical_types.IsNull()) {
+void Class::CopyCanonicalType(const Class& old_cls) const {
+  const Type& old_canonical_type = Type::Handle(old_cls.canonical_type());
+  if (old_canonical_type.IsNull()) {
     return;
   }
-  set_canonical_types(old_canonical_types);
+  set_canonical_type(old_canonical_type);
 }
 
 
 static intptr_t IndexOfEnum(const Array& enum_names, const String& name) {
   ASSERT(!enum_names.IsNull());
   ASSERT(!name.IsNull());
   String& enum_name = String::Handle();
   for (intptr_t i = 0; i < enum_names.Length(); i++) {
     enum_name = String::RawCast(enum_names.At(i));
     ASSERT(!enum_name.IsNull());
@@ skipping 368 matching lines @@
     }
     ClearAndSetStaticTarget(new_target);
   } else {
     ClearWithSentinel();
   }
 }
 
 #endif  // !PRODUCT
 
 }   // namespace dart.