Pass type arguments as a list in generic methods invocations

pkg/kernel/lib/transformations/reify/transformation/remove_generics.dart

 // Copyright (c) 2016, 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.
 
 library kernel.transformations.reify.transformation.remove_generics;
 
 import 'package:kernel/ast.dart';
 import 'transformer.dart';
 
 class Erasure extends Transformer with DartTypeVisitor<DartType> {
   final ReifyVisitor reifyVisitor;
 
   Erasure(this.reifyVisitor);
 
   bool removeTypeParameters(Class cls) {
     return reifyVisitor.needsTypeInformation(cls);
   }
 
   TreeNode removeTypeArgumentsOfConstructorCall(ConstructorInvocation node) {
     Class cls = node.target.parent;
     if (removeTypeParameters(cls)) {
       node.arguments.types.clear();
       Constructor target = node.target;
       target.enclosingClass.typeParameters.clear();
     }
     return node;
   }
 
   TreeNode removeTypeArgumentsOfStaticCall(StaticInvocation node) {
-    Class cls = node.target.parent;
-    if (removeTypeParameters(cls)) {
-      node.arguments.types.clear();
-      Procedure target = node.target;
-      target.function.typeParameters.clear();
+    if (node.target.parent is Class) {
+      Class cls = node.target.parent;
+      if (!removeTypeParameters(cls)) {
+        return node;
+      }
+    } else {
+      // If parent is a Library, then a global procedure is invoked, and it may
+      // be a generic function, so we need to remove type arguments anyway.
+      assert(node.target.parent is Library);
     }
+    node.arguments.types.clear();
+    Procedure target = node.target;
+    target.function.typeParameters.clear();
     return node;
   }
 
+  TreeNode removeTypeArgumentOfMethodInvocation(MethodInvocation node) {
+    node.arguments.types.clear();
+//    Procedure target = node.interfaceTarget;

[karlklose, 2017/02/24 12:07:23]

Why is this commented out?

[Dmitry Stefantsov, 2017/02/28 11:32:15]

I should have removed that. The idea is actually to keep type parameters and
pass them to VM, so that it has some information about types.

+//    target.function.typeParameters.clear();
+    return node;
+  }
+
   @override
   defaultDartType(DartType type) => type;
 
   @override
   InterfaceType visitInterfaceType(InterfaceType type) {
     if (removeTypeParameters(type.classNode)) {
       return new InterfaceType(type.classNode, const <DartType>[]);
     }
     return type;
   }
@@ skipping 40 matching lines @@
   DynamicType visitTypeParameterType(_) => const DynamicType();
 
   @override
   DartType visitDartType(DartType type) {
     return type.accept(this);
   }
 
   @override
   StaticInvocation visitStaticInvocation(StaticInvocation node) {
     node.transformChildren(this);
-    if (node.target.kind == ProcedureKind.Factory) {
+    if (node.target.kind == ProcedureKind.Factory ||
+        node.target.kind == ProcedureKind.Method) {
       node = removeTypeArgumentsOfStaticCall(node);
     }
     return node;
   }
 
   @override
   ConstructorInvocation visitConstructorInvocation(ConstructorInvocation node) {
     node.transformChildren(this);
     return removeTypeArgumentsOfConstructorCall(node);
   }
 
   @override
   Class visitClass(Class node) {
     node.transformChildren(this);
     if (removeTypeParameters(node)) {
       node.typeParameters.clear();
     }
     return node;
   }
+
+  @override
+  Expression visitMethodInvocation(MethodInvocation node) {
+    node.transformChildren(this);
+    return removeTypeArgumentOfMethodInvocation(node);
+  }
 }