Pass type argument vector to generic functions (if --reify-generic-functions is

runtime/vm/resolver.cc

 // Copyright (c) 2011, 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.
 
 #include "vm/resolver.h"
 
 #include "vm/dart_entry.h"
 #include "vm/flags.h"
 #include "vm/isolate.h"
 #include "vm/log.h"
@@ skipping 128 matching lines @@
     }
     cls = cls.SuperClass();
   }
   return function.raw();
 }
 
 
 RawFunction* Resolver::ResolveStatic(const Library& library,
                                      const String& class_name,
                                      const String& function_name,
+                                     intptr_t type_args_len,
                                      intptr_t num_arguments,
                                      const Array& argument_names) {
   ASSERT(!library.IsNull());
   Function& function = Function::Handle();
   if (class_name.IsNull() || (class_name.Length() == 0)) {
     // Check if we are referring to a top level function.
     const Object& object = Object::Handle(library.ResolveName(function_name));
     if (!object.IsNull() && object.IsFunction()) {
       function ^= object.raw();
-      if (!function.AreValidArguments(num_arguments, argument_names, NULL)) {
+      if (!function.AreValidArguments(type_args_len, num_arguments,
+                                      argument_names, NULL)) {
         if (FLAG_trace_resolving) {
           String& error_message = String::Handle();
           // Obtain more detailed error message.
-          function.AreValidArguments(num_arguments, argument_names,
-                                     &error_message);
+          function.AreValidArguments(type_args_len, num_arguments,
+                                     argument_names, &error_message);
           THR_Print("ResolveStatic error '%s': %s.\n",
                     function_name.ToCString(), error_message.ToCString());
         }
         function = Function::null();
       }
     } else {
       if (FLAG_trace_resolving) {
         THR_Print("ResolveStatic error: function '%s' not found.\n",
                   function_name.ToCString());
       }
     }
   } else {
     // Lookup class_name in the library's class dictionary to get at
     // the dart class object. If class_name is not found in the dictionary
     // ResolveStatic will return a NULL function object.
     const Class& cls = Class::Handle(library.LookupClass(class_name));
     if (!cls.IsNull()) {
-      function =
-          ResolveStatic(cls, function_name, num_arguments, argument_names);
+      function = ResolveStatic(cls, function_name, type_args_len, num_arguments,
+                               argument_names);
     }
     if (FLAG_trace_resolving && function.IsNull()) {
       THR_Print("ResolveStatic error: function '%s.%s' not found.\n",
                 class_name.ToCString(), function_name.ToCString());
     }
   }
   return function.raw();
 }
 
 
 RawFunction* Resolver::ResolveStatic(const Class& cls,
                                      const String& function_name,
+                                     intptr_t type_args_len,
                                      intptr_t num_arguments,
                                      const Array& argument_names) {
   ASSERT(!cls.IsNull());
   if (FLAG_trace_resolving) {
     THR_Print("ResolveStatic '%s'\n", function_name.ToCString());
   }
   const Function& function =
       Function::Handle(cls.LookupStaticFunction(function_name));
   if (function.IsNull() ||
-      !function.AreValidArguments(num_arguments, argument_names, NULL)) {
+      !function.AreValidArguments(type_args_len, num_arguments, argument_names,
+                                  NULL)) {
     // Return a null function to signal to the upper levels to throw a
     // resolution error or maybe throw the error right here.
     if (FLAG_trace_resolving) {
       String& error_message = String::Handle(String::New("function not found"));
       if (!function.IsNull()) {
         // Obtain more detailed error message.
-        function.AreValidArguments(num_arguments, argument_names,
+        function.AreValidArguments(type_args_len, num_arguments, argument_names,
                                    &error_message);
       }
       THR_Print("ResolveStatic error '%s': %s.\n", function_name.ToCString(),
                 error_message.ToCString());
     }
     return Function::null();
   }
   return function.raw();
 }
 
 
 RawFunction* Resolver::ResolveStaticAllowPrivate(const Class& cls,
                                                  const String& function_name,
+                                                 intptr_t type_args_len,
                                                  intptr_t num_arguments,
                                                  const Array& argument_names) {
   ASSERT(!cls.IsNull());
   if (FLAG_trace_resolving) {
     THR_Print("ResolveStaticAllowPrivate '%s'\n", function_name.ToCString());
   }
   const Function& function =
       Function::Handle(cls.LookupStaticFunctionAllowPrivate(function_name));
   if (function.IsNull() ||
-      !function.AreValidArguments(num_arguments, argument_names, NULL)) {
+      !function.AreValidArguments(type_args_len, num_arguments, argument_names,
+                                  NULL)) {
     // Return a null function to signal to the upper levels to throw a
     // resolution error or maybe throw the error right here.
     if (FLAG_trace_resolving) {
       String& error_message = String::Handle(String::New("function not found"));
       if (!function.IsNull()) {
         // Obtain more detailed error message.
-        function.AreValidArguments(num_arguments, argument_names,
+        function.AreValidArguments(type_args_len, num_arguments, argument_names,
                                    &error_message);
       }
       THR_Print("ResolveStaticAllowPrivate error '%s': %s.\n",
                 function_name.ToCString(), error_message.ToCString());
     }
     return Function::null();
   }
   return function.raw();
 }
 
 }  // namespace dart