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

runtime/vm/aot_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.
 
 #include "vm/aot_optimizer.h"
 
 #include "vm/bit_vector.h"
 #include "vm/branch_optimizer.h"
 #include "vm/cha.h"
 #include "vm/compiler.h"
@@ skipping 95 matching lines @@
     return false;
   }
 
   if (call->function_name().raw() != Symbols::GetRuntimeType().raw()) {
     return false;
   }
 
   // There is only a single function Object.get:runtimeType that can be invoked
   // by this call. Convert dynamic invocation to a static one.
   const Class& cls = Class::Handle(Z, I->object_store()->object_class());
+  const intptr_t kTypeArgsLen = 0;
+  ASSERT(call->type_args_len() == kTypeArgsLen);
   const Array& args_desc_array = Array::Handle(
-      Z,
-      ArgumentsDescriptor::New(call->ArgumentCount(), call->argument_names()));
+      Z, ArgumentsDescriptor::New(kTypeArgsLen, call->ArgumentCount(),
+                                  call->argument_names()));
   ArgumentsDescriptor args_desc(args_desc_array);
   const Function& function =
       Function::Handle(Z, Resolver::ResolveDynamicForReceiverClass(
                               cls, call->function_name(), args_desc));
   ASSERT(!function.IsNull());
 
   ZoneGrowableArray<PushArgumentInstr*>* args =
       new (Z) ZoneGrowableArray<PushArgumentInstr*>(call->ArgumentCount());
   for (intptr_t i = 0; i < call->ArgumentCount(); i++) {
     args->Add(call->PushArgumentAt(i));
   }
   StaticCallInstr* static_call = new (Z) StaticCallInstr(
-      call->token_pos(), Function::ZoneHandle(Z, function.raw()),
+      call->token_pos(), Function::ZoneHandle(Z, function.raw()), kTypeArgsLen,
       call->argument_names(), args, call->deopt_id());
   static_call->set_result_cid(kTypeCid);
   call->ReplaceWith(static_call, current_iterator());
   return true;
 }
 
 
 // Optimize instance calls using cid.  This is called after optimizer
 // converted instance calls to instructions. Any remaining
 // instance calls are either megamorphic calls, cannot be optimized or
@@ skipping 73 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),

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

This pattern gets repeated a lot. I'd recommend moving it to a utility function
on ArgumentsDescriptor or the call instructions, and you can include a comment
there saying why you need the adjustment.

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

Done.

+               call->argument_names()));
     ArgumentsDescriptor args_desc(args_desc_array);
     const Function& function = Function::Handle(
         Z, Resolver::ResolveDynamicForReceiverClass(
                receiver_class, call->function_name(), args_desc));
     if (function.IsNull()) {
       return false;
     }
 
     // Create new ICData, do not modify the one attached to the instruction
     // since it is attached to the assembly instruction itself.
     // TODO(srdjan): Prevent modification of ICData object that is
     // referenced in assembly code.
     const ICData& ic_data = ICData::ZoneHandle(
         Z, ICData::NewFrom(*call->ic_data(), class_ids.length()));
     if (class_ids.length() > 1) {
       ic_data.AddCheck(class_ids, function);
     } else {
       ASSERT(class_ids.length() == 1);
       ic_data.AddReceiverCheck(class_ids[0], function);
     }
     call->set_ic_data(&ic_data);
     return true;
   }
 
   if (isolate()->object_store()->unique_dynamic_targets() != Array::null()) {
     // Check if the target is unique.
     Function& target_function = Function::Handle(Z);
     GetUniqueDynamicTarget(isolate(), call->function_name(), &target_function);
-    // Calls with named arguments must be resolved/checked at runtime.
+    // Calls passing named arguments and calls to a function taking named
+    // arguments must be resolved/checked at runtime.
+    // Calls passing a type argument vector and calls to a generic function must
+    // be resolved/checked at runtime.
     if (!target_function.IsNull() &&
         !target_function.HasOptionalNamedParameters() &&
-        target_function.AreValidArgumentCounts(call->ArgumentCount(), 0,
+        !target_function.IsGeneric() &&
+        target_function.AreValidArgumentCounts(call->type_args_len(),
+                                               call->ArgumentCount(),
+                                               call->argument_names().Length(),
                                                /* error_message = */ NULL)) {
       const Class& cls = Class::Handle(Z, target_function.Owner());
       if (!CHA::IsImplemented(cls) && !CHA::HasSubclasses(cls)) {
         const ICData& ic_data =
             ICData::ZoneHandle(Z, ICData::NewFrom(*call->ic_data(), 1));
         ic_data.AddReceiverCheck(cls.id(), target_function);
         call->set_ic_data(&ic_data);
         if (has_unique_no_such_method_) {
           call->set_has_unique_selector(true);
           // Add redefinition of the receiver to prevent code motion across
@@ skipping 372 matching lines @@
 
     ZoneGrowableArray<PushArgumentInstr*>* args =
         new (Z) ZoneGrowableArray<PushArgumentInstr*>(2);
     PushArgumentInstr* arg =
         new (Z) PushArgumentInstr(new (Z) Value(left->ArgumentAt(0)));
     InsertBefore(call, arg, NULL, FlowGraph::kEffect);
     args->Add(arg);
     arg = new (Z) PushArgumentInstr(new (Z) Value(right->ArgumentAt(0)));
     InsertBefore(call, arg, NULL, FlowGraph::kEffect);
     args->Add(arg);
-    StaticCallInstr* static_call =
-        new (Z) StaticCallInstr(call->token_pos(), have_same_runtime_type,
-                                Object::null_array(),  // argument_names
-                                args, call->deopt_id());
+    const intptr_t kTypeArgsLen = 0;

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

ASSERT(call->type_args_len() == kTypeArgsLen) ?

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

Done, although arguments names and others were not checked either.

+    StaticCallInstr* static_call = new (Z)
+        StaticCallInstr(call->token_pos(), have_same_runtime_type, kTypeArgsLen,
+                        Object::null_array(),  // argument_names
+                        args, call->deopt_id());
     static_call->set_result_cid(kBoolCid);
     ReplaceCall(call, static_call);
     return true;
   }
 
   return false;
 }
 
 
 bool AotOptimizer::TryReplaceWithEqualityOp(InstanceCallInstr* call,
@@ skipping 842 matching lines @@
       args->Add(arg);
 
       const Library& dart_internal =
           Library::Handle(Z, Library::InternalLibrary());
       const String& target_name = Symbols::_classRangeCheck();
       const Function& target = Function::ZoneHandle(
           Z, dart_internal.LookupFunctionAllowPrivate(target_name));
       ASSERT(!target.IsNull());
       ASSERT(target.IsRecognized() && target.always_inline());
 
+      const intptr_t kTypeArgsLen = 0;

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

ditto.

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

Done.

       StaticCallInstr* new_call =
-          new (Z) StaticCallInstr(call->token_pos(), target,
+          new (Z) StaticCallInstr(call->token_pos(), target, kTypeArgsLen,
                                   Object::null_array(),  // argument_names
                                   args, call->deopt_id());
       Environment* copy = call->env()->DeepCopy(
           Z, call->env()->Length() - call->ArgumentCount());
       for (intptr_t i = 0; i < args->length(); ++i) {
         copy->PushValue(new (Z) Value((*args)[i]->value()->definition()));
       }
       call->RemoveEnvironment();
       ReplaceCall(call, new_call);
       copy->DeepCopyTo(Z, new_call);
@@ skipping 70 matching lines @@
     args->Add(arg);
 
     const Library& dart_internal = Library::Handle(Z, Library::CoreLibrary());
     const String& target_name = Symbols::_classIdEqualsAssert();
     const Function& target = Function::ZoneHandle(
         Z, dart_internal.LookupFunctionAllowPrivate(target_name));
     ASSERT(!target.IsNull());
     ASSERT(target.IsRecognized());
     ASSERT(target.always_inline());
 
+    const intptr_t kTypeArgsLen = 0;

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

ditto.

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

Done.

     StaticCallInstr* new_call =
-        new (Z) StaticCallInstr(call->token_pos(), target,
+        new (Z) StaticCallInstr(call->token_pos(), target, kTypeArgsLen,
                                 Object::null_array(),  // argument_names
                                 args, call->deopt_id());
     Environment* copy =
         call->env()->DeepCopy(Z, call->env()->Length() - call->ArgumentCount());
     for (intptr_t i = 0; i < args->length(); ++i) {
       copy->PushValue(new (Z) Value((*args)[i]->value()->definition()));
     }
     call->RemoveEnvironment();
     ReplaceCall(call, new_call);
     copy->DeepCopyTo(Z, new_call);
@@ skipping 41 matching lines @@
       args->Add(arg);
 
       const Library& dart_internal = Library::Handle(Z, Library::CoreLibrary());
       const String& target_name = Symbols::_classRangeAssert();
       const Function& target = Function::ZoneHandle(
           Z, dart_internal.LookupFunctionAllowPrivate(target_name));
       ASSERT(!target.IsNull());
       ASSERT(target.IsRecognized());
       ASSERT(target.always_inline());
 
+      const intptr_t kTypeArgsLen = 0;

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

ditto.

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

Done.

       StaticCallInstr* new_call =
-          new (Z) StaticCallInstr(call->token_pos(), target,
+          new (Z) StaticCallInstr(call->token_pos(), target, kTypeArgsLen,
                                   Object::null_array(),  // argument_names
                                   args, call->deopt_id());
       Environment* copy = call->env()->DeepCopy(
           Z, call->env()->Length() - call->ArgumentCount());
       for (intptr_t i = 0; i < args->length(); ++i) {
         copy->PushValue(new (Z) Value((*args)[i]->value()->definition()));
       }
       call->RemoveEnvironment();
       ReplaceCall(call, new_call);
       copy->DeepCopyTo(Z, new_call);
@@ skipping 209 matching lines @@
       break;
   }
 
   // No IC data checks. Try resolve target using the propagated cid.
   const intptr_t receiver_cid =
       instr->PushArgumentAt(0)->value()->Type()->ToCid();
   if (receiver_cid != kDynamicCid) {
     const Class& receiver_class =
         Class::Handle(Z, isolate()->class_table()->At(receiver_cid));
 
-    const Array& args_desc_array =
-        Array::Handle(Z, ArgumentsDescriptor::New(instr->ArgumentCount(),
-                                                  instr->argument_names()));
+    const Array& args_desc_array = Array::Handle(
+        Z, ArgumentsDescriptor::New(
+               instr->type_args_len(),
+               instr->ArgumentCount() - (instr->type_args_len() > 0 ? 1 : 0),
+               instr->argument_names()));
     ArgumentsDescriptor args_desc(args_desc_array);
     Function& function = Function::Handle(
         Z, Resolver::ResolveDynamicForReceiverClass(
                receiver_class, instr->function_name(), args_desc));
     if (!function.IsNull()) {
       CallTargets* targets = new (Z) CallTargets();
       Function& target = Function::ZoneHandle(Z, function.raw());
       targets->Add(CidRangeTarget(receiver_class.id(), receiver_class.id(),
                                   &target, /*count = */ 1));
       PolymorphicInstanceCallInstr* call =
@@ skipping 28 matching lines @@
     GrowableArray<intptr_t> class_ids(6);
     if (thread()->cha()->ConcreteSubclasses(receiver_class, &class_ids)) {
       // First check if all subclasses end up calling the same method.
       // If this is the case we will replace instance call with a direct
       // static call.
       // Otherwise we will try to create ICData that contains all possible
       // targets with appropriate checks.
       Function& single_target = Function::Handle(Z);
       ICData& ic_data = ICData::Handle(Z);
 
-      const Array& args_desc_array =
-          Array::Handle(Z, ArgumentsDescriptor::New(instr->ArgumentCount(),
-                                                    instr->argument_names()));
+      const Array& args_desc_array = Array::Handle(
+          Z, ArgumentsDescriptor::New(
+                 instr->type_args_len(),
+                 instr->ArgumentCount() - (instr->type_args_len() > 0 ? 1 : 0),
+                 instr->argument_names()));
       ArgumentsDescriptor args_desc(args_desc_array);
 
       Function& target = Function::Handle(Z);
       Class& cls = Class::Handle(Z);
       for (intptr_t i = 0; i < class_ids.length(); i++) {
         const intptr_t cid = class_ids[i];
         cls = isolate()->class_table()->At(cid);
         target = Resolver::ResolveDynamicForReceiverClass(
             cls, instr->function_name(), args_desc);
 
@@ skipping 57 matching lines @@
 
         // We have computed that there is only a single target for this call
         // within the whole hierarchy. Replace InstanceCall with StaticCall.
         ZoneGrowableArray<PushArgumentInstr*>* args = new (Z)
             ZoneGrowableArray<PushArgumentInstr*>(instr->ArgumentCount());
         for (intptr_t i = 0; i < instr->ArgumentCount(); i++) {
           args->Add(instr->PushArgumentAt(i));
         }
         StaticCallInstr* call = new (Z) StaticCallInstr(
             instr->token_pos(), Function::ZoneHandle(Z, single_target.raw()),
-            instr->argument_names(), args, instr->deopt_id());
+            instr->type_args_len(), instr->argument_names(), args,
+            instr->deopt_id());
         instr->ReplaceWith(call, current_iterator());
         return;
       } else if ((ic_data.raw() != ICData::null()) &&
                  !ic_data.NumberOfChecksIs(0)) {
         CallTargets* targets = CallTargets::Create(Z, ic_data);
         PolymorphicInstanceCallInstr* call =
             new (Z) PolymorphicInstanceCallInstr(instr, *targets,
                                                  /* with_checks = */ true,
                                                  /* complete = */ true);
         instr->ReplaceWith(call, current_iterator());
@@ skipping 21 matching lines @@
 
 void AotOptimizer::VisitPolymorphicInstanceCall(
     PolymorphicInstanceCallInstr* call) {
   if (call->with_checks()) {
     const intptr_t receiver_cid =
         call->PushArgumentAt(0)->value()->Type()->ToCid();
     if (receiver_cid != kDynamicCid) {
       const Class& receiver_class =
           Class::Handle(Z, isolate()->class_table()->At(receiver_cid));
 
+      const intptr_t type_args_len = call->instance_call()->type_args_len();
       const Array& args_desc_array = Array::Handle(
-          Z, ArgumentsDescriptor::New(call->ArgumentCount(),
-                                      call->instance_call()->argument_names()));
+          Z, ArgumentsDescriptor::New(
+                 type_args_len,
+                 call->ArgumentCount() - (type_args_len > 0 ? 1 : 0),
+                 call->instance_call()->argument_names()));
       ArgumentsDescriptor args_desc(args_desc_array);
       const Function& function = Function::Handle(
           Z, Resolver::ResolveDynamicForReceiverClass(
                  receiver_class, call->instance_call()->function_name(),
                  args_desc));
       if (!function.IsNull()) {
         call->set_with_checks(false);
       }
     }
   }
@@ skipping 165 matching lines @@
                                   FlowGraph::kEffect);
         current_iterator()->RemoveCurrentFromGraph();
       }
     }
   }
 }
 
 #endif  // DART_PRECOMPILER
 
 }  // namespace dart