Canonicalize mixin type during class finalization. Add asserts that most types are canonical.

runtime/lib/mirrors.cc

Index: runtime/lib/mirrors.cc
diff --git a/runtime/lib/mirrors.cc b/runtime/lib/mirrors.cc
index 63e05d0c66a591ea2df26cf844cab8d0240eda59..976ccd0f05b011da769735a7f5217e865d823f99 100644
--- a/runtime/lib/mirrors.cc
+++ b/runtime/lib/mirrors.cc
@@ -517,6 +517,7 @@ static RawInstance* CreateTypeMirror(const AbstractType& type) {
   }
   ASSERT(type.IsFinalized());
   PROPOGATE_IF_MALFOMRED(type);

[regis, 2015/05/29 22:16:50]

Raelly? :-)

[rmacnak, 2015/05/29 22:22:01]

'merikens can not spel.

+  ASSERT(type.IsCanonical() || type.IsTypeParameter() || type.IsBoundedType());
 
   if (type.HasResolvedTypeClass()) {
     const Class& cls = Class::Handle(type.type_class());
@@ -763,6 +764,7 @@ static RawAbstractType* InstantiateType(const AbstractType& type,
                                         const AbstractType& instantiator) {
   ASSERT(type.IsFinalized());
   PROPOGATE_IF_MALFOMRED(type);
+  ASSERT(type.IsCanonical() || type.IsTypeParameter() || type.IsBoundedType());
 
   if (type.IsInstantiated() || instantiator.IsNull()) {
     return type.Canonicalize();