Chromium Code Reviews| Index: runtime/vm/class_finalizer.cc |
| diff --git a/runtime/vm/class_finalizer.cc b/runtime/vm/class_finalizer.cc |
| index cd9bb2bf42f6b7dda41a95cea60a0b9ef9ccc322..84f3d88a9b721d3079901c5a61bce62b762d3015 100644 |
| --- a/runtime/vm/class_finalizer.cc |
| +++ b/runtime/vm/class_finalizer.cc |
| @@ -1297,7 +1297,11 @@ void ClassFinalizer::ResolveAndFinalizeMemberTypes(const Class& cls) { |
| // interfaces to refer to the respective type parameters of the mixin |
| // application class. |
| void ClassFinalizer::CloneTypeParameters(const Class& mixapp_class) { |
| - ASSERT(mixapp_class.NumTypeParameters() == 0); |
| + if (mixapp_class.NumTypeParameters() != 0) { |
| + // Mixin applications created by typedef can introduce their own type |
| + // paramaters. |
| + return; |
|
regis
2013/08/20 18:56:37
I think that returning here is actually correct if
|
| + } |
| const AbstractType& super_type = |
| AbstractType::Handle(mixapp_class.super_type()); |