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

runtime/vm/jit_optimizer.cc

 // Copyright (c) 2013, 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 DART_PRECOMPILED_RUNTIME
 #include "vm/jit_optimizer.h"
 
 #include "vm/bit_vector.h"
 #include "vm/branch_optimizer.h"
 #include "vm/cha.h"
 #include "vm/compiler.h"
@@ skipping 119 matching lines @@
 
   if (all_cids_known) {
     const Class& receiver_class =
         Class::Handle(Z, isolate()->class_table()->At(class_ids[0]));
     if (!receiver_class.is_finalized()) {
       // Do not eagerly finalize classes. ResolveDynamicForReceiverClass can
       // cause class finalization, since callee's receiver class may not be
       // finalized yet.
       return false;
     }
-    const Array& args_desc_array =
-        Array::Handle(Z, ArgumentsDescriptor::New(call->ArgumentCount(),
-                                                  call->argument_names()));
+    const Array& args_desc_array = Array::Handle(
+        Z, ArgumentsDescriptor::New(
+               call->type_args_len(),
+               call->ArgumentCount() - (call->type_args_len() > 0 ? 1 : 0),
+               call->argument_names()));
     ArgumentsDescriptor args_desc(args_desc_array);
     bool allow_add = false;
     const Function& function = Function::Handle(
         Z, Resolver::ResolveDynamicForReceiverClass(
                receiver_class, call->function_name(), args_desc, allow_add));
     if (function.IsNull()) {
       return false;
     }
 
     // Create new ICData, do not modify the one attached to the instruction
@@ skipping 11 matching lines @@
     call->set_ic_data(&ic_data);
     return true;
   }
 
   // Check if getter or setter in function's class and class is currently leaf.
   if (FLAG_guess_icdata_cid && ((call->token_kind() == Token::kGET) ||
                                 (call->token_kind() == Token::kSET))) {
     const Class& owner_class = Class::Handle(Z, function().Owner());
     if (!owner_class.is_abstract() && !CHA::HasSubclasses(owner_class) &&
         !CHA::IsImplemented(owner_class)) {
-      const Array& args_desc_array =
-          Array::Handle(Z, ArgumentsDescriptor::New(call->ArgumentCount(),
-                                                    call->argument_names()));
+      const int kTypeArgsLen = 0;
+      ASSERT(call->type_args_len() == kTypeArgsLen);
+      const Array& args_desc_array = Array::Handle(
+          Z, ArgumentsDescriptor::New(kTypeArgsLen, call->ArgumentCount(),
+                                      call->argument_names()));
       ArgumentsDescriptor args_desc(args_desc_array);
       bool allow_add = false;
       const Function& function = Function::Handle(
           Z, Resolver::ResolveDynamicForReceiverClass(
                  owner_class, call->function_name(), args_desc, allow_add));
       if (!function.IsNull()) {
         const ICData& ic_data = ICData::ZoneHandle(
             Z, ICData::NewFrom(*call->ic_data(), class_ids.length()));
         ic_data.AddReceiverCheck(owner_class.id(), function);
         call->set_ic_data(&ic_data);
@@ skipping 1626 matching lines @@
   // Discard the environment from the original instruction because the store
   // can't deoptimize.
   instr->RemoveEnvironment();
   ReplaceCall(instr, store);
   return true;
 }
 
 
 }  // namespace dart
 #endif  // DART_PRECOMPILED_RUNTIME