Capture type variables in global NSM stubs

- Add a type argument count to JSInvocationMirror.
- Change stubs to pass the argument count.

Change-Id: I448dbee9a2aa0be17c24ae79eae0c89e7574fa7c
Reviewed-on: https://dart-review.googlesource.com/49820
Commit-Queue: Stephen Adams <[email protected]>
Reviewed-by: Sigmund Cherem <[email protected]>

Author: rakudrama

pkg/compiler/lib/src/js_emitter/class_stub_generator.dart

@@ -183,7 +183,8 @@ class ClassStubGenerator {
     // Values match JSInvocationMirror in js-helper library.
     int type = selector.invocationMirrorKind;
     List<String> parameterNames =
-        new List.generate(selector.argumentCount, (i) => '\$$i');
+        new List.generate(selector.argumentCount, (i) => '\$$i') +
+            new List.generate(selector.typeArgumentCount, (i) => '\$T${i + 1}');
 
     List<jsAst.Expression> argNames = selector.callStructure
         .getOrderedNamedArguments()
@@ -200,7 +201,8 @@ class ClassStubGenerator {
                                             #internalName,
                                             #type,
                                             #arguments,
-                                            #namedArguments))''', {
+                                            #namedArguments,
+                                            #typeArgumentCount))''', {
       'receiver': isIntercepted ? r'$receiver' : 'this',
       'noSuchMethodName': _namer.noSuchMethodName,
       'createInvocationMirror':
@@ -210,7 +212,8 @@ class ClassStubGenerator {
       'internalName': js.quoteName(internalName),
       'type': js.number(type),
       'arguments': new jsAst.ArrayInitializer(parameterNames.map(js).toList()),
-      'namedArguments': new jsAst.ArrayInitializer(argNames)
+      'namedArguments': new jsAst.ArrayInitializer(argNames),
+      'typeArgumentCount': js.number(selector.typeArgumentCount)
     });
 
     jsAst.Expression function;

pkg/compiler/lib/src/js_emitter/full_emitter/nsm_emitter.dart

@@ -89,6 +89,7 @@ class NsmEmitter extends CodeEmitterHelper {
     if (!generateTrivialNsmHandlers) return false;
     // Check for named arguments.
     if (argNames.length != 0) return false;
+    if (selector.typeArgumentCount > 0) return false;
     // Check for unexpected name (this doesn't really happen).
     if (internalName is GetterName) return type == 1;
     if (internalName is SetterName) return type == 2;
@@ -261,7 +262,7 @@ class NsmEmitter extends CodeEmitterHelper {
           // Generate call to:
           //
           //     createInvocationMirror(String name, internalName, type,
-          //         arguments, argumentNames)
+          //         arguments, argumentNames, typeArgumentCount)
           //
 
           // This 'if' is either a static choice or dynamic choice depending on
@@ -276,7 +277,8 @@ class NsmEmitter extends CodeEmitterHelper {
                           // Create proper Array with all arguments except first
                           // (receiver).
                           Array.prototype.slice.call(arguments, 1),
-                          []));
+                          [],
+                          0));
                   }
                  })(#names[j], shortName, type);
           } else {
@@ -290,7 +292,8 @@ class NsmEmitter extends CodeEmitterHelper {
                       #createInvocationMirror(name, shortName, type,
                           // Create proper Array with all arguments.
                           Array.prototype.slice.call(arguments, 0),
-                          []));
+                          [],
+                          0));
                   }
                  })(#names[j], shortName, type);
           }

pkg/compiler/lib/src/ssa/builder.dart

@@ -3198,7 +3198,8 @@ class SsaAstGraphBuilder extends ast.Visitor
           graph.addConstantStringFromName(internalName, closedWorld),
           graph.addConstant(kindConstant, closedWorld),
           argumentsInstruction,
-          argumentNamesInstruction
+          argumentNamesInstruction,
+          graph.addConstantInt(0, closedWorld), // type argument count.
         ],
         typeMask: commonMasks.dynamicType);
 

pkg/compiler/lib/src/ssa/builder_kernel.dart

@@ -4114,7 +4114,8 @@ class KernelSsaGraphBuilder extends ir.Visitor
           graph.addConstantStringFromName(internalName, closedWorld),
           graph.addConstant(kindConstant, closedWorld),
           argumentsInstruction,
-          argumentNamesInstruction
+          argumentNamesInstruction,
+          graph.addConstantInt(typeArguments.length, closedWorld),
         ],
         commonMasks.dynamicType,
         typeArguments);

sdk/lib/_internal/js_runtime/lib/js_helper.dart

@@ -262,16 +262,19 @@ String S(value) {
   return res;
 }
 
+// Called from generated code.
 createInvocationMirror(
-    String name, internalName, kind, arguments, argumentNames) {
+    String name, internalName, kind, arguments, argumentNames, types) {
+  // TODO(sra): [types] (the number of type arguments) could be omitted in the
+  // generated stub code to save an argument. Then we would use `types ?? 0`.
   return new JSInvocationMirror(
-      name, internalName, kind, arguments, argumentNames);
+      name, internalName, kind, arguments, argumentNames, types);
 }
 
 createUnmangledInvocationMirror(
     Symbol symbol, internalName, kind, arguments, argumentNames) {
   return new JSInvocationMirror(
-      symbol, internalName, kind, arguments, argumentNames);
+      symbol, internalName, kind, arguments, argumentNames, 0);
 }
 
 void throwInvalidReflectionError(String memberName) {
@@ -333,11 +336,12 @@ class JSInvocationMirror implements Invocation {
   final List<Type> _typeArguments;
   final List _arguments;
   final List _namedArgumentNames;
+  final int _typeArgumentCount;
   /** Map from argument name to index in _arguments. */
   Map<String, dynamic> _namedIndices = null;
 
   JSInvocationMirror(this._memberName, this._internalName, this._kind,
-      this._arguments, this._namedArgumentNames);
+      this._arguments, this._namedArgumentNames, this._typeArgumentCount);
 
   Symbol get memberName {
     if (_memberName is Symbol) return _memberName;
@@ -361,13 +365,20 @@ class JSInvocationMirror implements Invocation {
   bool get isAccessor => _kind != METHOD;
 
   List<Type> get typeArguments {
-    // UNIMPLEMENTED
-    return const <Type>[];
+    if (_typeArgumentCount == 0) return const <Type>[];
+    int start = _arguments.length - _typeArgumentCount;
+    var list = <Type>[];
+    for (int index = 0; index < _typeArgumentCount; index++) {
+      list.add(
+          createRuntimeType(runtimeTypeToString(_arguments[start + index])));
+    }
+    return list;
   }
 
   List get positionalArguments {
     if (isGetter) return const [];
-    var argumentCount = _arguments.length - _namedArgumentNames.length;
+    var argumentCount =
+        _arguments.length - _namedArgumentNames.length - _typeArgumentCount;
     if (argumentCount == 0) return const [];
     var list = [];
     for (var index = 0; index < argumentCount; index++) {
@@ -379,7 +390,8 @@ class JSInvocationMirror implements Invocation {
   Map<Symbol, dynamic> get namedArguments {
     if (isAccessor) return const <Symbol, dynamic>{};
     int namedArgumentCount = _namedArgumentNames.length;
-    int namedArgumentsStartIndex = _arguments.length - namedArgumentCount;
+    int namedArgumentsStartIndex =
+        _arguments.length - namedArgumentCount - _typeArgumentCount;
     if (namedArgumentCount == 0) return const <Symbol, dynamic>{};
     var map = new Map<Symbol, dynamic>();
     for (int i = 0; i < namedArgumentCount; i++) {

tests/language_2/no_such_method_simple_type_arguments_test.dart

@@ -0,0 +1,23 @@
+// Copyright (c) 2018, 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.
+// dart2jsOptions=--disable-rti-optimization
+
+// Dart test program testing that type arguments are captured by the Invocation
+// passed to noSuchMethod from a dynamic call.
+
+import "package:expect/expect.dart";
+
+class Mock {
+  noSuchMethod(i) => i.typeArguments;
+}
+
+void main() {
+  var g = new Mock();
+
+  Expect.listEquals(
+      [String, int], (g as dynamic).hurrah<String, int>(moose: 42, duck: 12));
+
+  // map has interceptor calling convention in dart2js.
+  Expect.listEquals([String, int], (g as dynamic).map<String, int>());
+}