Adjust index of type parameters at finalization time (fix issue 718).

runtime/vm/class_finalizer.h

Index: runtime/vm/class_finalizer.h
===================================================================
--- runtime/vm/class_finalizer.h	(revision 2282)
+++ runtime/vm/class_finalizer.h	(working copy)
@@ -41,9 +41,11 @@
                                    AbstractType* interface,
                                    AbstractType* conflicting);
 
-  // Finalize and canonicalize type while parsing.
+  // Finalize and canonicalize type while parsing class cls.
   // Set the error message on failure (to String::null() if no error).
-  static RawType* FinalizeAndCanonicalizeType(const Type& type, String* errmsg);
+  static RawAbstractType* FinalizeAndCanonicalizeType(const Class& cls,
+                                                      const AbstractType& type,

[srdjan, 2011/12/08 22:30:29]

Maybe it would make sense to have 'type' as first argument?

[regis, 2011/12/08 22:50:20]

Not unless we also change ResolveClass, ResolveType,
ResolveAndFinalizeSignature, etc... which all take cls as the first argument.

+                                                      String* errmsg);
 
   // Pending classes are classes that need to be finalized.
   static void AddPendingClasses(const GrowableArray<const Class*>& classes);
@@ -80,7 +82,8 @@
   static void FinalizeTypeArguments(const Class& cls,
                                     const AbstractTypeArguments& arguments);
   static void ResolveType(const Class& cls, const AbstractType& type);
-  static RawAbstractType* FinalizeType(const AbstractType& type);
+  static RawAbstractType* FinalizeType(const Class& cls,
+                                       const AbstractType& type);

[srdjan, 2011/12/08 22:30:29]

ditto

[regis, 2011/12/08 22:50:20]

ditto

   static void ResolveAndFinalizeUpperBounds(const Class& cls);
   static void VerifyUpperBounds(const Class& cls,
                                 const AbstractTypeArguments& arguments);