Clean up ClosureMirror.invoke(#call, ...).

runtime/lib/mirrors_impl.dart

 // 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.
 
 // VM-specific implementation of the dart:mirrors library.
 
 import "dart:collection";
 
 final emptyList = new UnmodifiableListView([]);
 final emptyMap = new _UnmodifiableMapView({});
@@ skipping 428 matching lines @@
   _LocalClosureMirror(reflectee) : super(reflectee);
 
   MethodMirror _function;
   MethodMirror get function {
     if (_function == null) {
       _function = _computeFunction(reflectee);
     }
     return _function;
   }
 
-  // TODO(12602): Remove this special case.
-  delegate(Invocation invocation) {
-    if (invocation.isMethod && (invocation.memberName == #call)) {
-      return this.apply(invocation.positionalArguments,
-                        invocation.namedArguments).reflectee;
-    }
-    return super.delegate(invocation);
-  }
-
   InstanceMirror apply(List<Object> positionalArguments,
                        [Map<Symbol, Object> namedArguments]) {
-    // TODO(12602): When closures get an ordinary call method, this can be
-    // replaced with
-    //   return this.invoke(#call, positionalArguments, namedArguments);
-    // and the native ClosureMirror_apply can be removed.
-    int numPositionalArguments = positionalArguments.length + 1;  // Receiver.
-    int numNamedArguments = namedArguments != null ? namedArguments.length : 0;
-    int numArguments = numPositionalArguments + numNamedArguments;
-    List arguments = new List(numArguments);
-    arguments[0] = _reflectee;  // Receiver.
-    arguments.setRange(1, numPositionalArguments, positionalArguments);
-    List names = new List(numNamedArguments);
-    int argumentIndex = numPositionalArguments;
-    int nameIndex = 0;
-    if (numNamedArguments > 0) {
-      namedArguments.forEach((name, value) {
-        arguments[argumentIndex++] = value;
-        names[nameIndex++] = _n(name);
-      });
-    }
-
-    // It is tempting to implement this in terms of Function.apply, but then
-    // lazy compilation errors would be fatal.
-    return reflect(_apply(arguments, names));
+    return this.invoke(#call, positionalArguments, namedArguments);
   }
 
   InstanceMirror findInContext(Symbol name, {ifAbsent: null}) {
     List<String> parts = _n(name).split(".").toList(growable: false);
     if (parts.length > 3) {
       throw new ArgumentError("Invalid symbol: ${name}");
     }
     List tuple = _computeFindInContext(_reflectee, parts);
     if (tuple.length == 0) {
       throw new UnsupportedError(
@@ skipping 1137 matching lines @@
     if (typeMirror == null) {
       typeMirror = makeLocalTypeMirror(key);
       _instanitationCache[key] = typeMirror;
       if (typeMirror is ClassMirror && !typeMirror._isGeneric) {
         _declarationCache[key] = typeMirror;
       }
     }
     return typeMirror;
   }
 }