Hoist .simpleName and .qualifiedName up to _LocalDeclarationMirrorImpl.

runtime/lib/mirrors.cc

 // 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.
 
 #include "include/dart_api.h"
 #include "include/dart_debugger_api.h"
 #include "include/dart_mirrors_api.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_api_state.h"  // TODO(11742): Remove with CreateMirrorRef.
 #include "vm/bootstrap_natives.h"
@@ skipping 348 matching lines @@
     Dart_Null(),  // "name"
     type_var_map,
   };
   Dart_Handle mirror = Dart_New(type, Dart_Null(), ARRAY_SIZE(args), args);
   return mirror;
 }
 
 
 static RawInstance* CreateMethodMirror(const Function& func,
                                        const Instance& owner_mirror) {
-  const Array& args = Array::Handle(Array::New(11));
+  const Array& args = Array::Handle(Array::New(12));
   args.SetAt(0, MirrorReference::Handle(MirrorReference::New(func)));
-  args.SetAt(1, owner_mirror);
-  args.SetAt(2, func.is_static() ? Bool::True() : Bool::False());
-  args.SetAt(3, func.is_abstract() ? Bool::True() : Bool::False());
-  args.SetAt(4, func.IsGetterFunction() ? Bool::True() : Bool::False());
-  args.SetAt(5, func.IsSetterFunction() ? Bool::True() : Bool::False());
-  args.SetAt(6, func.IsConstructor() ? Bool::True() : Bool::False());
+  args.SetAt(1, String::Handle(func.UserVisibleName()));
+  args.SetAt(2, owner_mirror);
+  args.SetAt(3, func.is_static() ? Bool::True() : Bool::False());
+  args.SetAt(4, func.is_abstract() ? Bool::True() : Bool::False());
+  args.SetAt(5, func.IsGetterFunction() ? Bool::True() : Bool::False());
+  args.SetAt(6, func.IsSetterFunction() ? Bool::True() : Bool::False());
+  args.SetAt(7, func.IsConstructor() ? Bool::True() : Bool::False());
   // TODO(mlippautz): Implement different constructor kinds.
-  args.SetAt(7, Bool::False());
   args.SetAt(8, Bool::False());
   args.SetAt(9, Bool::False());
   args.SetAt(10, Bool::False());
+  args.SetAt(11, Bool::False());
   return CreateMirror(Symbols::_LocalMethodMirrorImpl(), args);
 }
 
 
 static RawInstance* CreateVariableMirror(const Field& field,
                                          const Instance& owner_mirror) {
   const MirrorReference& field_ref =
       MirrorReference::Handle(MirrorReference::New(field));
 
   const String& name = String::Handle(field.UserVisibleName());
@@ skipping 991 matching lines @@
                            setter_name.ToCString()));
     ThrowMirroredCompilationError(message);
     UNREACHABLE();
   }
 
   field.set_value(value);
   return value.raw();
 }
 
 
-DEFINE_NATIVE_ENTRY(MethodMirror_name, 1) {
-  GET_NON_NULL_NATIVE_ARGUMENT(MirrorReference, ref, arguments->NativeArgAt(0));
-  const Function& func = Function::Handle(ref.GetFunctionReferent());
-  return func.UserVisibleName();
-}
-
-
 DEFINE_NATIVE_ENTRY(MethodMirror_owner, 1) {
   GET_NON_NULL_NATIVE_ARGUMENT(MirrorReference, ref, arguments->NativeArgAt(0));
   const Function& func = Function::Handle(ref.GetFunctionReferent());
   if (func.IsNonImplicitClosureFunction()) {
     return CreateMethodMirror(Function::Handle(
         func.parent_function()), Object::null_instance());
   }
   const Class& owner = Class::Handle(func.Owner());
   if (owner.IsTopLevel()) {
     return CreateLibraryMirror(Library::Handle(owner.library()));
@@ skipping 31 matching lines @@
 
 DEFINE_NATIVE_ENTRY(VariableMirror_type, 1) {
   GET_NON_NULL_NATIVE_ARGUMENT(MirrorReference, ref, arguments->NativeArgAt(0));
   const Field& field = Field::Handle(ref.GetFieldReferent());
 
   const AbstractType& type = AbstractType::Handle(field.type());
   return CreateTypeMirror(type);
 }
 
 }  // namespace dart