Keep track of type parameter processing in mixin application classes.

runtime/vm/class_finalizer.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_CLASS_FINALIZER_H_
 #define VM_CLASS_FINALIZER_H_
 
 #include "vm/allocation.h"
 #include "vm/growable_array.h"
 
@@ skipping 75 matching lines @@
   static void FinalizeClass(const Class& cls);
 
   // Verify that the classes have been properly prefinalized. This is
   // needed during bootstrapping where the classes have been preloaded.
   static void VerifyBootstrapClasses();
 
   // Resolve the type and target of the redirecting factory.
   static void ResolveRedirectingFactory(const Class& cls,
                                         const Function& factory);
 
+  // Apply the mixin type to the mixin application class.
+  static void ApplyMixinType(const Class& mixin_app_class);
+
  private:
   static bool IsSuperCycleFree(const Class& cls);
   static bool IsParameterTypeCycleFree(const Class& cls,
                                        const AbstractType& type,
                                        GrowableArray<intptr_t>* visited);
   static bool IsAliasCycleFree(const Class& cls,
                                GrowableArray<intptr_t>* visited);
   static void CheckForLegalConstClass(const Class& cls);
   static RawClass* ResolveClass(const Class& cls,
                                 const UnresolvedClass& unresolved_class,
                                 Error* ambiguity_error);
   static void ResolveRedirectingFactoryTarget(
       const Class& cls,
       const Function& factory,
       const GrowableObjectArray& visited_factories);
-  static void CloneTypeParameters(const Class& mixapp_class);
-  static void ApplyMixinTypes(const Class& cls);
-  static void ApplyMixin(const Class& cls);
+  static void CloneTypeParameters(const Class& mixin_app_class);
+  static void ApplyMixinMembers(const Class& cls);
   static void CreateForwardingConstructors(
       const Class& mixin_app,
       const GrowableObjectArray& cloned_funcs);
   static void CollectTypeArguments(const Class& cls,
                                    const Type& type,
                                    const GrowableObjectArray& collected_args);
   static RawType* ResolveMixinAppType(const Class& cls,
                                       const MixinAppType& mixin_app);
   static void ResolveSuperTypeAndInterfaces(const Class& cls,
                                             GrowableArray<intptr_t>* visited);
@@ skipping 29 matching lines @@
   static void ReportError(const char* format, ...) PRINTF_ATTRIBUTE(1, 2);
 
   // Verify implicit offsets recorded in the VM for direct access to fields of
   // Dart instances (e.g: _TypedListView, _ByteDataView).
   static void VerifyImplicitFieldOffsets();
 };
 
 }  // namespace dart
 
 #endif  // VM_CLASS_FINALIZER_H_