Pass a second type argument vector to all type instantiation calls in the VM.

runtime/lib/object.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/bootstrap_natives.h"
 
 #include "lib/invocation_mirror.h"
 #include "vm/code_patcher.h"
 #include "vm/exceptions.h"
 #include "vm/heap.h"
@@ skipping 151 matching lines @@
   }
 
   const TypeArguments& left_type_arguments =
       TypeArguments::Handle(left.GetTypeArguments());
   const TypeArguments& right_type_arguments =
       TypeArguments::Handle(right.GetTypeArguments());
   return Bool::Get(left_type_arguments.Equals(right_type_arguments)).raw();
 }
 
 
-DEFINE_NATIVE_ENTRY(Object_instanceOf, 3) {
+DEFINE_NATIVE_ENTRY(Object_instanceOf, 4) {
   const Instance& instance =
       Instance::CheckedHandle(zone, arguments->NativeArgAt(0));
   const TypeArguments& instantiator_type_arguments =
       TypeArguments::CheckedHandle(zone, arguments->NativeArgAt(1));
+  const TypeArguments& function_type_arguments =
+      TypeArguments::CheckedHandle(zone, arguments->NativeArgAt(2));
   const AbstractType& type =
-      AbstractType::CheckedHandle(zone, arguments->NativeArgAt(2));
+      AbstractType::CheckedHandle(zone, arguments->NativeArgAt(3));
   ASSERT(type.IsFinalized());
   ASSERT(!type.IsMalformed());
   ASSERT(!type.IsMalbounded());
   Error& bound_error = Error::Handle(zone, Error::null());
-  const bool is_instance_of =
-      instance.IsInstanceOf(type, instantiator_type_arguments, &bound_error);
+  const bool is_instance_of = instance.IsInstanceOf(
+      type, instantiator_type_arguments, function_type_arguments, &bound_error);
   if (FLAG_trace_type_checks) {
     const char* result_str = is_instance_of ? "true" : "false";
     OS::Print("Native Object.instanceOf: result %s\n", result_str);
     const AbstractType& instance_type =
         AbstractType::Handle(zone, instance.GetType(Heap::kNew));
     OS::Print("  instance type: %s\n",
               String::Handle(zone, instance_type.Name()).ToCString());
     OS::Print("  test type: %s\n",
               String::Handle(zone, type.Name()).ToCString());
     if (!bound_error.IsNull()) {
@@ skipping 16 matching lines @@
   return Bool::Get(is_instance_of).raw();
 }
 
 DEFINE_NATIVE_ENTRY(Object_simpleInstanceOf, 2) {
   // This native is only called when the right hand side passes
   // SimpleInstanceOfType and it is a non-negative test.
   const Instance& instance =
       Instance::CheckedHandle(zone, arguments->NativeArgAt(0));
   const AbstractType& type =
       AbstractType::CheckedHandle(zone, arguments->NativeArgAt(1));
-  const TypeArguments& instantiator_type_arguments =
+  const TypeArguments& null_type_arguments =
       TypeArguments::Handle(TypeArguments::null());
   ASSERT(type.IsFinalized());
   ASSERT(!type.IsMalformed());
   ASSERT(!type.IsMalbounded());
+  ASSERT(type.IsInstantiated());
   Error& bound_error = Error::Handle(zone, Error::null());
-  const bool is_instance_of =
-      instance.IsInstanceOf(type, instantiator_type_arguments, &bound_error);
+  const bool is_instance_of = instance.IsInstanceOf(
+      type, null_type_arguments, null_type_arguments, &bound_error);

[siva, 2017/04/10 22:04:55]

ditto question about using Object::null_type_arguments() instead of the local
null_type_arguments

[regis, 2017/04/11 04:23:07]

Done.

   if (!is_instance_of && !bound_error.IsNull()) {
     // Throw a dynamic type error only if the instanceof test fails.
     DartFrameIterator iterator;
     StackFrame* caller_frame = iterator.NextFrame();
     ASSERT(caller_frame != NULL);
     const TokenPosition location = caller_frame->GetTokenPos();
     String& bound_error_message =
         String::Handle(zone, String::New(bound_error.ToErrorCString()));
     Exceptions::CreateAndThrowTypeError(location, AbstractType::Handle(zone),
                                         AbstractType::Handle(zone),
                                         Symbols::Empty(), bound_error_message);
     UNREACHABLE();
   }
   return Bool::Get(is_instance_of).raw();
 }
 
 
-DEFINE_NATIVE_ENTRY(Object_as, 3) {
+DEFINE_NATIVE_ENTRY(Object_as, 4) {
   const Instance& instance =
       Instance::CheckedHandle(zone, arguments->NativeArgAt(0));
   const TypeArguments& instantiator_type_arguments =
       TypeArguments::CheckedHandle(zone, arguments->NativeArgAt(1));
+  const TypeArguments& function_type_arguments =
+      TypeArguments::CheckedHandle(zone, arguments->NativeArgAt(2));
   AbstractType& type =
-      AbstractType::CheckedHandle(zone, arguments->NativeArgAt(2));
+      AbstractType::CheckedHandle(zone, arguments->NativeArgAt(3));
   ASSERT(type.IsFinalized());
   ASSERT(!type.IsMalformed());
   ASSERT(!type.IsMalbounded());
   Error& bound_error = Error::Handle(zone);
   const bool is_instance_of =
       instance.IsNull() ||
-      instance.IsInstanceOf(type, instantiator_type_arguments, &bound_error);
+      instance.IsInstanceOf(type, instantiator_type_arguments,
+                            function_type_arguments, &bound_error);
   if (FLAG_trace_type_checks) {
     const char* result_str = is_instance_of ? "true" : "false";
     OS::Print("Object.as: result %s\n", result_str);
     const AbstractType& instance_type =
         AbstractType::Handle(zone, instance.GetType(Heap::kNew));
     OS::Print("  instance type: %s\n",
               String::Handle(zone, instance_type.Name()).ToCString());
     OS::Print("  cast type: %s\n",
               String::Handle(zone, type.Name()).ToCString());
     if (!bound_error.IsNull()) {
       OS::Print("  bound error: %s\n", bound_error.ToErrorCString());
     }
   }
   if (!is_instance_of) {
     DartFrameIterator iterator;
     StackFrame* caller_frame = iterator.NextFrame();
     ASSERT(caller_frame != NULL);
     const TokenPosition location = caller_frame->GetTokenPos();
     const AbstractType& instance_type =
         AbstractType::Handle(zone, instance.GetType(Heap::kNew));
     if (!type.IsInstantiated()) {
       // Instantiate type before reporting the error.
-      type = type.InstantiateFrom(instantiator_type_arguments, NULL, NULL, NULL,
+      type = type.InstantiateFrom(instantiator_type_arguments,
+                                  function_type_arguments, NULL, NULL, NULL,
                                   Heap::kNew);
       // Note that the instantiated type may be malformed.
     }
     if (bound_error.IsNull()) {
       Exceptions::CreateAndThrowTypeError(location, instance_type, type,
                                           Symbols::InTypeCast(),
                                           Object::null_string());
     } else {
       ASSERT(isolate->type_checks());
       const String& bound_error_message =
@@ skipping 52 matching lines @@
 
 DEFINE_NATIVE_ENTRY(Internal_inquireIs64Bit, 0) {
 #if defined(ARCH_IS_64_BIT)
   return Bool::True().raw();
 #else
   return Bool::False().raw();
 #endif  // defined(ARCH_IS_64_BIT)
 }
 
 }  // namespace dart