Convert MethodMirror.returnType to native calls (and more)

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.
 
 // These values are allowed to be passed directly over the wire.
 bool _isSimpleValue(var value) {
   return (value == null || value is num || value is String || value is bool);
 }
@@ skipping 85 matching lines @@
       : this.libraries = _createLibrariesMap(libraries),
         _functionTypes = new Map<String, FunctionTypeMirror>();
 
   final Map<Uri, LibraryMirror> libraries;
   final IsolateMirror isolate;
 
   TypeMirror _dynamicType = null;
 
   TypeMirror get dynamicType {
     if (_dynamicType == null) {
-      _dynamicType = new _SpecialTypeMirrorImpl(_s('dynamic'));
+      _dynamicType = new _SpecialTypeMirrorImpl('dynamic');
     }
     return _dynamicType;
   }
 
   TypeMirror _voidType = null;
 
   TypeMirror get voidType {
     if (_voidType == null) {
-      _voidType = new _SpecialTypeMirrorImpl(_s('void'));
+      _voidType = new _SpecialTypeMirrorImpl('void');
     }
     return _voidType;
   }
 
   final Map<String, FunctionTypeMirror> _functionTypes;
   FunctionTypeMirror _lookupFunctionTypeMirror(
       TypeMirror returnType,
       List<ParameterMirror> parameters) {
     var sigString = _makeSignatureString(returnType, parameters);
     var mirror = _functionTypes[sigString];
@@ skipping 739 matching lines @@
 
   _invokeSetter(reflectee, setterName, value)
       native 'LibraryMirror_invokeSetter';
 }
 
 class _LocalMethodMirrorImpl extends _LocalDeclarationMirrorImpl
     implements MethodMirror {
   _LocalMethodMirrorImpl(reflectee,
                          this._owner,
                          this.parameters,
-                         this._returnType,
                          this.isStatic,
                          this.isAbstract,
                          this.isGetter,
                          this.isSetter,
                          this.isConstructor,
                          this.isConstConstructor,
                          this.isGenerativeConstructor,
                          this.isRedirectingConstructor,
                          this.isFactoryConstructor) : super(reflectee);
 
@@ skipping 32 matching lines @@
         _n(constructorName).startsWith('_');
   }
 
   bool get isTopLevel =>  owner is LibraryMirror;
 
   SourceLocation get location {
     throw new UnimplementedError(
         'MethodMirror.location is not implemented');
   }
 
-  var _returnType;
+  TypeMirror _returnType = null;
   TypeMirror get returnType {
-    if (_returnType is! Mirror) {
-      _returnType = _returnType.resolve(mirrors);
+    if (isConstructor) {

[rmacnak, 2013/07/19 20:37:22]

What if _returnType isn't null? This will fetch it again.

[Michael Lippautz (Google), 2013/07/19 20:53:01]

Fixed.

+      _returnType = _owner;
+    } else {
+      _returnType = _MethodMirror_return_type(_reflectee);
     }
     return _returnType;
   }
 
   final List<ParameterMirror> parameters;
 
   final bool isStatic;
   final bool isAbstract;
 
   bool get isRegularMethod => !isGetter && !isSetter && !isConstructor;
@@ skipping 33 matching lines @@
   final bool isRedirectingConstructor;
   final bool isFactoryConstructor;
 
   String toString() => "MethodMirror on '${_n(simpleName)}'";
 
   static String _MethodMirror_name(reflectee)
       native "MethodMirror_name";
 
   static dynamic _MethodMirror_owner(reflectee)
       native "MethodMirror_owner";
+
+  static dynamic _MethodMirror_return_type(reflectee)
+      native "MethodMirror_return_type";
 }
 
 class _LocalVariableMirrorImpl extends _LocalDeclarationMirrorImpl
     implements VariableMirror {
   _LocalVariableMirrorImpl(reflectee,
                            String simpleName,
                            this._owner,
                            this._type,
                            this.isStatic,
                            this.isFinal)
@@ skipping 64 matching lines @@
 
   // TODO(11418): Implement.
   List<InstanceMirror> get metadata {
     throw new UnimplementedError(
         'ParameterMirror.metadata is not implemented');
   }
 }
 
 class _SpecialTypeMirrorImpl extends _LocalMirrorImpl
     implements TypeMirror, DeclarationMirror {
-  _SpecialTypeMirrorImpl(this.simpleName);
+  _SpecialTypeMirrorImpl(String name) : simpleName = _s(name);
 
   final bool isPrivate = false;
   final bool isTopLevel = true;
 
   // Fixed length 0, therefore immutable.
   final List<InstanceMirror> metadata = new List(0);
 
   final DeclarationMirror owner = null;
   final Symbol simpleName;
 
@@ skipping 58 matching lines @@
   static Expando<ClassMirror> _classMirrorCache = new Expando("ClassMirror");
   static ClassMirror reflectClass(Type key) {
     var classMirror = _classMirrorCache[key];
     if (classMirror == null) {
       classMirror = makeLocalClassMirror(key);
       _classMirrorCache[key] = classMirror;
     }
     return classMirror;
   }
 }