Mixins with Generics

runtime/vm/class_finalizer.h

Index: runtime/vm/class_finalizer.h
===================================================================
--- runtime/vm/class_finalizer.h	(revision 20045)
+++ runtime/vm/class_finalizer.h	(working copy)
@@ -11,6 +11,7 @@
 namespace dart {
 
 class AbstractType;
+class MixinAppType;
 class AbstractTypeArguments;
 class Class;
 class Error;
@@ -99,7 +100,15 @@
       const Class& cls,
       const Function& factory,
       const GrowableObjectArray& visited_factories);
+

[regis, 2013/03/14 23:40:34]

No blank line elsewhere in this private section.

[hausner, 2013/03/15 00:36:32]

Removed

+  static void CloneTypeParameters(const Class& mixapp_class);
   static void ApplyMixin(const Class& cls);
+

[regis, 2013/03/14 23:40:34]

... except here.

[hausner, 2013/03/15 00:36:32]

Also removed.

[hausner, 2013/03/15 00:36:32]

Also removed.

+  static void CopyArgs(const Class& cls,
+                       const Type& type,
+                       const GrowableObjectArray& args);
+  static RawType* ResolveMixinAppType(const Class& cls,
+                                      const MixinAppType& mixin_app);
   static void ResolveSuperTypeAndInterfaces(const Class& cls,
                                             GrowableArray<intptr_t>* visited);
   static void FinalizeTypeParameters(const Class& cls);