Set type argument vector at run time in instantiated closure objects.

runtime/vm/code_generator.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/code_generator.h"
 
 #include "vm/code_index_table.h"
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
 #include "vm/dart_entry.h"
@@ skipping 203 matching lines @@
          !instantiator.IsTypeArray() ||
          (instantiator.Length() != type_arguments.Length()));
   type_arguments = TypeArguments::NewInstantiatedTypeArguments(type_arguments,
                                                                instantiator);
   arguments.SetReturn(type_arguments);
 }
 
 
 // Allocate a new closure.
 // Arg0: local function.
-// TODO(regis): Arg1: type arguments of the closure.
+// Arg1: type arguments of the closure.
 // Return value: newly allocated closure.
-DEFINE_RUNTIME_ENTRY(AllocateClosure, 1) {
+DEFINE_RUNTIME_ENTRY(AllocateClosure, 2) {
   ASSERT(arguments.Count() == kAllocateClosureRuntimeEntry.argument_count());
   const Function& function = Function::CheckedHandle(arguments.At(0));
   ASSERT(function.IsClosureFunction() && !function.IsImplicitClosureFunction());
-  // TODO(regis): Process type arguments unless the closure is static.
+  const TypeArguments& type_arguments =
+      TypeArguments::CheckedHandle(arguments.At(1));
+  ASSERT(type_arguments.IsNull() || type_arguments.IsInstantiated());
   // The current context was saved in the Isolate structure when entering the
   // runtime.
   const Context& context = Context::Handle(Isolate::Current()->top_context());
   ASSERT(!context.IsNull());
-  arguments.SetReturn(Closure::Handle(Closure::New(function, context)));
+  const Closure& closure = Closure::Handle(Closure::New(function, context));
+  closure.SetTypeArguments(type_arguments);
+  arguments.SetReturn(closure);
 }
 
 
 // Allocate a new implicit static closure.
 // Arg0: local function.
 // Return value: newly allocated closure.
 DEFINE_RUNTIME_ENTRY(AllocateImplicitStaticClosure, 1) {
   ASSERT(arguments.Count() ==
          kAllocateImplicitStaticClosureRuntimeEntry.argument_count());
   ObjectStore* object_store = Isolate::Current()->object_store();
   ASSERT(object_store != NULL);
   const Function& function = Function::CheckedHandle(arguments.At(0));
   ASSERT(function.IsImplicitStaticClosureFunction());
   const Context& context = Context::Handle(object_store->empty_context());
   arguments.SetReturn(Closure::Handle(Closure::New(function, context)));
 }
 
 
 // Allocate a new implicit instance closure.
 // Arg0: local function.
 // Arg1: receiver object.
-// TODO(regis): Arg2: type arguments of the closure.
+// Arg2: type arguments of the closure.
 // Return value: newly allocated closure.
-DEFINE_RUNTIME_ENTRY(AllocateImplicitInstanceClosure, 2) {
+DEFINE_RUNTIME_ENTRY(AllocateImplicitInstanceClosure, 3) {
   ASSERT(arguments.Count() ==
          kAllocateImplicitInstanceClosureRuntimeEntry.argument_count());
   const Function& function = Function::CheckedHandle(arguments.At(0));
   ASSERT(function.IsImplicitInstanceClosureFunction());
   const Instance& receiver = Instance::CheckedHandle(arguments.At(1));
+  const TypeArguments& type_arguments =
+      TypeArguments::CheckedHandle(arguments.At(2));
+  ASSERT(type_arguments.IsNull() || type_arguments.IsInstantiated());
   Context& context = Context::Handle();
   context = Context::New(1);
   context.SetAt(0, receiver);
-  arguments.SetReturn(Closure::Handle(Closure::New(function, context)));
-  // TODO(regis): Set type arguments.
+  const Closure& closure = Closure::Handle(Closure::New(function, context));
+  closure.SetTypeArguments(type_arguments);
+  arguments.SetReturn(closure);
 }
 
 
 // Allocate a new context large enough to hold the given number of variables.
 // Arg0: number of variables.
 // Return value: newly allocated context.
 DEFINE_RUNTIME_ENTRY(AllocateContext, 1) {
   CHECK_STACK_ALIGNMENT;
   ASSERT(arguments.Count() == kAllocateContextRuntimeEntry.argument_count());
   const Smi& num_variables = Smi::CheckedHandle(arguments.At(0));
@@ skipping 712 matching lines @@
       }
     }
   }
   // The cache is null terminated, therefore the loop above should never
   // terminate by itself.
   UNREACHABLE();
   return Code::null();
 }
 
 }  // namespace dart