Add a MirrorReference reflectee to MethodMirrors. Name getter now refers to

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 612 matching lines @@
     member_map,
     constructor_map,
     type_var_map,
   };
   Dart_Handle mirror = Dart_New(type, Dart_Null(), ARRAY_SIZE(args), args);
   return mirror;
 }
 
 
 static Dart_Handle CreateMethodMirror(Dart_Handle func,
-                                      Dart_Handle func_name,
                                       Dart_Handle owner_mirror) {
   ASSERT(Dart_IsFunction(func));
   Dart_Handle mirror_cls_name = NewString("_LocalMethodMirrorImpl");
   Dart_Handle mirror_type = Dart_GetType(MirrorLib(), mirror_cls_name, 0, NULL);
   if (Dart_IsError(mirror_type)) {
     return mirror_type;
   }
 
   bool is_static = false;
   bool is_abstract = false;
@@ skipping 31 matching lines @@
   int64_t opt_param_count;
   result = Dart_FunctionParameterCounts(func,
                                         &fixed_param_count,
                                         &opt_param_count);
   if (Dart_IsError(result)) {
     return result;
   }
 
   // TODO(turnidge): Implement constructor kinds (arguments 7 - 10).
   Dart_Handle args[] = {
-    func_name,
+    CreateMirrorReference(func),
     owner_mirror,
     CreateParameterMirrorList(func),
     CreateLazyMirror(return_type),
     Dart_NewBoolean(is_static),
     Dart_NewBoolean(is_abstract),
     Dart_NewBoolean(is_getter),
     Dart_NewBoolean(is_setter),
     Dart_NewBoolean(is_constructor),
     Dart_False(),
     Dart_False(),
@@ skipping 103 matching lines @@
     bool is_constructor = false;
     result = Dart_FunctionIsConstructor(func, &is_constructor);
     if (Dart_IsError(result)) {
       return result;
     }
     if (is_constructor) {
       // Skip constructors.
       continue;
     }
 
-    Dart_Handle func_mirror = CreateMethodMirror(func, func_name, owner_mirror);
+    Dart_Handle func_mirror = CreateMethodMirror(func, owner_mirror);
     if (Dart_IsError(func_mirror)) {
       return func_mirror;
     }
     result = MapAdd(map, func_name, func_mirror);
     if (Dart_IsError(result)) {
       return result;
     }
   }
   return Dart_True();
 }
@@ skipping 23 matching lines @@
     bool is_constructor = false;
     result = Dart_FunctionIsConstructor(func, &is_constructor);
     if (Dart_IsError(result)) {
       return result;
     }
     if (!is_constructor) {
       // Skip non-constructors.
       continue;
     }
 
-    Dart_Handle func_mirror = CreateMethodMirror(func, func_name, owner_mirror);
+    Dart_Handle func_mirror = CreateMethodMirror(func, owner_mirror);
     if (Dart_IsError(func_mirror)) {
       return func_mirror;
     }
     result = MapAdd(map, func_name, func_mirror);
     if (Dart_IsError(result)) {
       return result;
     }
   }
   return Dart_True();
 }
@@ skipping 214 matching lines @@
     if (Dart_IsError(type)) {
       return type;
     }
     // We set the function field of ClosureMirrors outside of the constructor
     // to break the mutual recursion.
     Dart_Handle func = Dart_ClosureFunction(instance);
     if (Dart_IsError(func)) {
       return func;
     }
 
     // TODO(turnidge): Why not use the real function name here?

[rmacnak, 2013/07/09 22:27:46]

Comment no longer applies

-    Dart_Handle func_name = NewString("call");
     Dart_Handle func_owner = Dart_FunctionOwner(func);
     if (Dart_IsError(func_owner)) {
       return func_owner;
     }
 
     // TODO(turnidge): Pass the function owner here.  This will require
     // us to support functions in CreateLazyMirror.
     Dart_Handle func_mirror =
-        CreateMethodMirror(func, func_name, Dart_Null());
+        CreateMethodMirror(func, Dart_Null());
     if (Dart_IsError(func_mirror)) {
       return func_mirror;
     }
     Dart_Handle args[] = {
       CreateVMReference(instance),
       CreateLazyMirror(instance_cls),
       instance,
       func_mirror,
     };
     return Dart_New(type, Dart_Null(), ARRAY_SIZE(args), args);
@@ skipping 314 matching lines @@
 
 
 DEFINE_NATIVE_ENTRY(ClassMirror_name, 1) {
   const MirrorReference& klass_ref =
       MirrorReference::CheckedHandle(arguments->NativeArgAt(0));
   Class& klass = Class::Handle();
   klass ^= klass_ref.referent();
   return klass.Name();
 }
 
+DEFINE_NATIVE_ENTRY(MethodMirror_name, 1) {
+  const MirrorReference& func_ref =
+      MirrorReference::CheckedHandle(arguments->NativeArgAt(0));
+  Function& func = Function::Handle();
+  func ^= func_ref.referent();
+  return func.UserVisibleName();
+}

[siva, 2013/07/10 00:09:49]

I think it is possible to abstract this into a single native call which returns
the name of the mirror object, i.e. if we get a class mirror object we do the
stuff in ClassMirror_name or if it is a function we do the stuff you just added.
I am sure there will be more such types.

Maybe Ryan can do this clean up to have a unified native method for getting the
name of a mirror object.

[rmacnak, 2013/07/10 00:28:58]

So you're suggesting we dispatch on the kind of reflectee inside the native
(fewer, larger), rather than have a native for each which assumes a particular
kind (more, smaller). My inclination is toward the latter.

[siva, 2013/07/10 01:04:19]

Yes. It is not going to be too large maybe a switch statement based on the class
id of the reflectee. We are already into a native method the performance
overhead of a switch statement is not going to make it any worse.

With the latter approach we could end up with a number of these name methods
which almost all look the same except for the type.

On 2013/07/10 00:28:58, Ryan Macnak wrote:

+
+

[siva, 2013/07/10 00:09:49]

extra blank line here.

[Michael Lippautz (Google), 2013/07/10 00:30:41]

Done.

 }  // namespace dart