[VM generic function reification] Support generic functions in Invocation class.

runtime/vm/parser.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/parser.h"
 #include "vm/flags.h"
 
 #ifndef DART_PRECOMPILED_RUNTIME
 
 #include "lib/invocation_mirror.h"
@@ skipping 2400 matching lines @@
   arguments->Add(new LiteralNode(args_pos, function_name));
   // The second argument is the arguments descriptor of the original function.
   const Array& args_descriptor = Array::ZoneHandle(
       ArgumentsDescriptor::New(function_args.type_args_len(),
                                function_args.length(), function_args.names()));
   arguments->Add(new LiteralNode(args_pos, args_descriptor));
   // The third argument is an array containing the original function arguments,
   // including the function type arguments and the receiver.
   ArrayNode* args_array =
       new ArrayNode(args_pos, Type::ZoneHandle(Type::ArrayType()));
-  // The type_args_var is only used in the generated body of an implicit closure
-  // where noSuchMethod should never be called.
-  ASSERT(function_args.type_args_var() == NULL);
-  if (!function_args.type_arguments().IsNull()) {
-    // TODO(regis): Pass the original type arguments to the invocation mirror.
+  // A type_args_var is allocated in the generated body of an implicit
+  // closure and in the generated body of a noSuchMethodDispatcher.
+  // Pass the type arguments to the invocation mirror as the first argument.
+  if (function_args.type_args_var() != NULL) {
+    ASSERT(function_args.type_arguments().IsNull());
+    args_array->AddElement(
+        new LoadLocalNode(args_pos, function_args.type_args_var()));
+  } else if (!function_args.type_arguments().IsNull()) {
+    args_array->AddElement(
+        new LiteralNode(args_pos, function_args.type_arguments()));
   }
   for (intptr_t i = 0; i < function_args.length(); i++) {
     AstNode* arg = function_args.NodeAt(i);
     if ((temp_for_last_arg != NULL) && (i == function_args.length() - 1)) {
       LetNode* store_arg = new LetNode(arg->token_pos());
       store_arg->AddNode(
           new StoreLocalNode(arg->token_pos(), temp_for_last_arg, arg));
       store_arg->AddNode(
           new LoadLocalNode(arg->token_pos(), temp_for_last_arg));
       args_array->AddElement(store_arg);
@@ skipping 12677 matching lines @@
 bool Parser::FieldHasFunctionLiteralInitializer(const Field& field,
                                                 TokenPosition* start,
                                                 TokenPosition* end) {
   UNREACHABLE();
   return false;
 }
 
 }  // namespace dart
 
 #endif  // DART_PRECOMPILED_RUNTIME