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

runtime/vm/intermediate_language_dbc.cc

 // Copyright (c) 2016, 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/globals.h"  // Needed here to get TARGET_ARCH_DBC.
 #if defined(TARGET_ARCH_DBC)
 
 #include "vm/intermediate_language.h"
 
 #include "vm/cpu.h"
@@ skipping 222 matching lines @@
     __ Drop1();
   }
 }
 
 
 EMIT_NATIVE_CODE(PolymorphicInstanceCall,
                  0,
                  Location::RegisterLocation(0),
                  LocationSummary::kCall) {
   const Array& arguments_descriptor = Array::Handle(ArgumentsDescriptor::New(
-      instance_call()->ArgumentCount(), instance_call()->argument_names()));
+      instance_call()->type_args_len(), instance_call()->ArgumentCount(),

[zra, 2017/05/03 15:03:24]

Does this one need to be adjusted?

[regis, 2017/05/09 18:31:23]

Good catch! I missed this one. One more reason to add helper functions.
I also used a ZoneHandle.

+      instance_call()->argument_names()));
   const intptr_t argdesc_kidx = __ AddConstant(arguments_descriptor);
   const CallTargets& ic_data = targets();
 
   // Push the target onto the stack.
   if (with_checks()) {
     const intptr_t length = ic_data.length();
     if (!Utils::IsUint(8, length)) {
       Unsupported(compiler);
       UNREACHABLE();
     }
@@ skipping 190 matching lines @@
 
 
 EMIT_NATIVE_CODE(ClosureCall,
                  1,
                  Location::RegisterLocation(0),
                  LocationSummary::kCall) {
   if (compiler->is_optimizing()) {
     __ Push(locs()->in(0).reg());
   }
 
-  intptr_t argument_count = ArgumentCount();
-  const Array& arguments_descriptor = Array::ZoneHandle(
-      ArgumentsDescriptor::New(argument_count, argument_names()));
+  const intptr_t ta_len = type_args_len();
+  const intptr_t argument_count = ArgumentCount();  // Includes type args.
+  const Array& arguments_descriptor =
+      Array::ZoneHandle(ArgumentsDescriptor::New(
+          ta_len, argument_count - (ta_len > 0 ? 1 : 0), argument_names()));
   const intptr_t argdesc_kidx =
       compiler->assembler()->AddConstant(arguments_descriptor);
   __ StaticCall(argument_count, argdesc_kidx);
   compiler->RecordAfterCall(this, FlowGraphCompiler::kHasResult);
   if (compiler->is_optimizing()) {
     __ PopLocal(locs()->out(0).reg());
   }
 }
 
 
@@ skipping 445 matching lines @@
 }
 
 
 EMIT_NATIVE_CODE(StringInterpolate,
                  1,
                  Location::RegisterLocation(0),
                  LocationSummary::kCall) {
   if (compiler->is_optimizing()) {
     __ Push(locs()->in(0).reg());
   }
+  const intptr_t kTypeArgsLen = 0;
   const intptr_t kArgumentCount = 1;
-  const Array& arguments_descriptor = Array::Handle(
-      ArgumentsDescriptor::New(kArgumentCount, Object::null_array()));
+  const Array& arguments_descriptor = Array::Handle(ArgumentsDescriptor::New(
+      kTypeArgsLen, kArgumentCount, Object::null_array()));
   __ PushConstant(CallFunction());
   const intptr_t argdesc_kidx = __ AddConstant(arguments_descriptor);
   __ StaticCall(kArgumentCount, argdesc_kidx);
   // Note: can't use RecordAfterCall here because
   // StringInterpolateInstr::ArgumentCount() is 0. However
   // internally it does a call with 1 argument which needs to
   // be reflected in the lazy deoptimization environment.
   compiler->RecordAfterCallHelper(token_pos(), deopt_id(), kArgumentCount,
                                   FlowGraphCompiler::kHasResult, locs());
   if (compiler->is_optimizing()) {
@@ skipping 1148 matching lines @@
   }
   __ IfULe(length, index);
   compiler->EmitDeopt(deopt_id(), ICData::kDeoptCheckArrayBound,
                       (generalized_ ? ICData::kGeneralized : 0) |
                           (licm_hoisted_ ? ICData::kHoisted : 0));
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_DBC