Implement closure with type arguments.

runtime/vm/flow_graph_builder.cc

 // Copyright (c) 2012, 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/flow_graph_builder.h"
 
 #include "vm/ast_printer.h"
 #include "vm/dart_entry.h"
 #include "vm/flags.h"
 #include "vm/intermediate_language.h"
@@ skipping 1169 matching lines @@
     }
     ++next_index;
   }
   ASSERT(function.context_scope() != ContextScope::null());
 
   // The function type of a closure may have type arguments. In that case, pass
   // the type arguments of the instantiator.
   const Class& cls = Class::Handle(function.signature_class());
   ASSERT(!cls.IsNull());
   const bool requires_type_arguments = cls.HasTypeArguments();
+  Value* type_arguments = NULL;
   if (requires_type_arguments) {
-    Bailout("Closure creation requiring type arguments");
+    ASSERT(!function.IsImplicitStaticClosureFunction());
+    type_arguments =
+        BuildInstantiatorTypeArguments(node->token_index(), temp_index());
   }
 
-  CreateClosureComp* create = new CreateClosureComp(node);
+  CreateClosureComp* create = new CreateClosureComp(node, type_arguments);
   ReturnComputation(create);
 }
 
 
 void EffectGraphVisitor::TranslateArgumentList(
     const ArgumentListNode& node,
     intptr_t next_temp_index,
     ZoneGrowableArray<Value*>* values) {
   for (intptr_t i = 0; i < node.length(); ++i) {
     ArgumentGraphVisitor for_argument(owner(), next_temp_index);
@@ skipping 861 matching lines @@
   OS::Print("CreateArray(");
   for (int i = 0; i < comp->ElementCount(); ++i) {
     if (i != 0) OS::Print(", ");
     comp->ElementAt(i)->Accept(this);
   }
   OS::Print(")");
 }
 
 
 void FlowGraphPrinter::VisitCreateClosure(CreateClosureComp* comp) {
-  OS::Print("CreateClosure(%s)", comp->function().ToCString());
+  OS::Print("CreateClosure(%s", comp->function().ToCString());
+  if (comp->type_arguments() != NULL) {
+    OS::Print(", ");
+    comp->type_arguments()->Accept(this);
+  }
+  OS::Print(")");
 }
 
 
 void FlowGraphPrinter::VisitNativeLoadField(NativeLoadFieldComp* comp) {
   OS::Print("NativeLoadField(");
   comp->value()->Accept(this);
   OS::Print(", %d)", comp->offset_in_bytes());
 }
 
 
@@ skipping 232 matching lines @@
   char* chars = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len));
   OS::SNPrint(chars, len, kFormat, function_name, reason);
   const Error& error = Error::Handle(
       LanguageError::New(String::Handle(String::New(chars))));
   Isolate::Current()->long_jump_base()->Jump(1, error);
 }
 
 
 }  // namespace dart