Convert InstantiatedTypeArguments to TypeArguments upon canonicalization.

runtime/vm/object.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_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 1191 matching lines @@
   virtual RawAbstractTypeArguments* InstantiateFrom(
       const AbstractTypeArguments& instantiator_type_arguments,
       Error* bound_error) const;
 
   // Do not clone InstantiatedTypeArguments or null vectors, since they are
   // considered finalized.
   virtual RawAbstractTypeArguments* CloneUnfinalized() const {
     return this->raw();
   }
 
-  // Do not canonicalize InstantiatedTypeArguments or null vectors.
+  // Null vectors are canonical.
   virtual RawAbstractTypeArguments* Canonicalize() const { return this->raw(); }
 
   // The name of this type argument vector, e.g. "<T, dynamic, List<T>, Smi>".
   virtual RawString* Name() const {
     return SubvectorName(0, Length(), kInternalName);
   }
 
   // The name of this type argument vector, e.g. "<T, dynamic, List<T>, int>".
   // Names of internal classes are mapped to their public interfaces.
   virtual RawString* UserVisibleName() const {
@@ skipping 153 matching lines @@
   virtual bool IsUninstantiatedIdentity() const {
     UNREACHABLE();
     return false;
   }
   virtual bool CanShareInstantiatorTypeArguments(
       const Class& instantiator_class) const {
     UNREACHABLE();
     return false;
   }
   virtual bool IsBounded() const { return false; }  // Bounds were checked.
+  virtual RawAbstractTypeArguments* Canonicalize() const;
 
   RawAbstractTypeArguments* uninstantiated_type_arguments() const {
     return raw_ptr()->uninstantiated_type_arguments_;
   }
   static intptr_t uninstantiated_type_arguments_offset() {
     return OFFSET_OF(RawInstantiatedTypeArguments,
                      uninstantiated_type_arguments_);
   }
 
   RawAbstractTypeArguments* instantiator_type_arguments() const {
@@ skipping 5167 matching lines @@
 
 
 RawObject* MegamorphicCache::GetTargetFunction(const Array& array,
                                                intptr_t index) {
   return array.At((index * kEntryLength) + kTargetFunctionIndex);
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_