Deal with type arguments of generic local functions in VM mirrors.

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" show UnmodifiableListView, UnmodifiableMapView;
 
 final emptyList = new UnmodifiableListView([]);
 final emptyMap = new UnmodifiableMapView({});
@@ skipping 1339 matching lines @@
   final bool isShow;
 
   _LocalCombinatorMirror(identifierString, this.isShow)
       : this.identifiers = [_s(identifierString)];
 
   bool get isHide => !isShow;
 }
 
 class _LocalMethodMirror extends _LocalDeclarationMirror
     implements MethodMirror {
+  final _instantiatorForLocal;

[regis, 2015/04/08 20:58:06]

I do not understand the meaning of "ForLocal".

[rmacnak, 2015/04/08 21:35:05]

I was only setting this for local functions, then failing back to the owner's
instantiator when this field was null. I've uploaded another patch where this
field is always set, and renamed it just _instantiator. PTAL.

   final bool isStatic;
   final bool isAbstract;
   final bool isGetter;
   final bool isSetter;
   final bool isConstructor;
   final bool isConstConstructor;
   final bool isGenerativeConstructor;
   final bool isRedirectingConstructor;
   final bool isFactoryConstructor;
   final bool isOperator;
 
   static const _operators = const ["%", "&", "*", "+", "-", "/", "<", "<<",
       "<=", "==", ">", ">=", ">>", "[]", "[]=", "^", "|", "~", "unary-", "~/"];
 
   _LocalMethodMirror(reflectee,
                      String simpleName,
                      this._owner,
+                     this._instantiatorForLocal,
                      this.isStatic,
                      this.isAbstract,
                      this.isGetter,
                      this.isSetter,
                      this.isConstructor,
                      this.isConstConstructor,
                      this.isGenerativeConstructor,
                      this.isRedirectingConstructor,
                      this.isFactoryConstructor)
       : this.isOperator = _operators.contains(simpleName),
         super(reflectee, _s(simpleName));
 
   DeclarationMirror _owner;
   DeclarationMirror get owner {
     // For nested closures it is possible, that the mirror for the owner has not
     // been created yet.
     if (_owner == null) {
-      _owner = _MethodMirror_owner(_reflectee);
+      _owner = _MethodMirror_owner(_reflectee, _instantiatorForLocal);
     }
     return _owner;
   }
 
   bool get isPrivate => _n(simpleName).startsWith('_') ||
                         _n(constructorName).startsWith('_');
 
   bool get isTopLevel => owner is LibraryMirror;
   bool get isSynthetic => false;
 
   Type get _instantiator {
+    if (_instantiatorForLocal != null) {
+      return _instantiatorForLocal;
+    }
     var o = owner;
     while (o is MethodMirror) o = o.owner;
     return o._instantiator;
   }
 
   TypeMirror _returnType = null;
   TypeMirror get returnType {
     if (_returnType == null) {
       if (isConstructor) {
         _returnType = owner;
@@ skipping 50 matching lines @@
     var cn = _n(constructorName);
     if(cn == ''){
       _simpleName = _s(ownerName);
     } else {
       _simpleName = _s(ownerName + "." + cn);
     }
   }
 
   String toString() => "MethodMirror on '${MirrorSystem.getName(simpleName)}'";
 
-  static dynamic _MethodMirror_owner(reflectee)
+  static dynamic _MethodMirror_owner(reflectee, instantiator)
       native "MethodMirror_owner";
 
   static dynamic _MethodMirror_return_type(reflectee, instantiator)
       native "MethodMirror_return_type";
 
   List<ParameterMirror> _MethodMirror_parameters(reflectee)
       native "MethodMirror_parameters";
 
   static String _MethodMirror_source(reflectee)
       native "MethodMirror_source";
@@ skipping 77 matching lines @@
   SourceLocation get location {
     throw new UnsupportedError("ParameterMirror.location unimplemented");
   }
 
   List<InstanceMirror> get metadata {
     if (_unmirroredMetadata == null) return emptyList;
     return new UnmodifiableListView(_unmirroredMetadata.map(reflect));
   }
 
   Type get _instantiator {
-    var o = owner;
-    while (o is MethodMirror) o = o.owner;
-    return o._instantiator;
+    return owner._instantiator;
   }
 
   TypeMirror _type = null;
   TypeMirror get type {
     if (_type == null) {
       _type = reflectType(
           _ParameterMirror_type(_reflectee, _position, _instantiator));
     }
     return _type;
   }
@@ skipping 101 matching lines @@
     if (typeMirror == null) {
       typeMirror = makeLocalTypeMirror(key);
       _instanitationCache[key] = typeMirror;
       if (typeMirror is ClassMirror && !typeMirror._isGeneric) {
         _declarationCache[key] = typeMirror;
       }
     }
     return typeMirror;
   }
 }