Adding proper handling for MethodMirror.owner

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"
 #include "vm/dart_entry.h"
 #include "vm/exceptions.h"
 #include "vm/message.h"
 #include "vm/port.h"
 #include "vm/resolver.h"
 #include "vm/symbols.h"
 
 namespace dart {
 
+static RawObject* CreateClassMirror(const Class& cls);

[rmacnak, 2013/07/17 22:27:50]

RawInstance* --- we know they will be mirrors

[Michael Lippautz (Google), 2013/07/17 22:43:19]

Done.

+static RawObject* CreateLibraryMirror(const Library& lib);
+static RawObject* CreateMethodMirror(const Function& func,
+                                     const Instance& owner);

[rmacnak, 2013/07/17 22:27:50]

owner_mirror, no?

[Michael Lippautz (Google), 2013/07/17 22:43:19]

Done.

+
 inline Dart_Handle NewString(const char* str) {
   return Dart_NewStringFromCString(str);
 }
 
 
 DEFINE_NATIVE_ENTRY(Mirrors_isLocalPort, 1) {
   GET_NON_NULL_NATIVE_ARGUMENT(Instance, port, arguments->NativeArgAt(0));
 
   // Get the port id from the SendPort instance.
   const Object& id_obj = Object::Handle(DartLibraryCalls::PortGetId(port));
@@ skipping 981 matching lines @@
     Dart_Handle args[] = {
       CreateVMReference(instance),
       CreateLazyMirror(instance_cls),
       instance,
     };
     return Dart_New(type, Dart_Null(), ARRAY_SIZE(args), args);
   }
 }
 
 
+// TODO(11742): At some point the function taking native parameters will get
+// default and one using Dart_Handles will disappear.

[rmacnak, 2013/07/17 22:27:50]

will get default ... => will replace the version that uses API handles

[Michael Lippautz (Google), 2013/07/17 22:43:19]

Done.

+static RawObject* CreateClassMirror(const Class& cls) {
+  Isolate* isolate = Isolate::Current();
+  DARTSCOPE(isolate);
+  Dart_Handle cls_handle = Api::NewHandle(isolate, cls.raw());
+  if (Dart_IsError(cls_handle)) {
+    Dart_PropagateError(cls_handle);
+  }
+  Dart_Handle name_handle = Api::NewHandle(isolate, cls.Name());
+  if (Dart_IsError(name_handle)) {
+    Dart_PropagateError(name_handle);
+  }
+  Dart_Handle lib_handle = Api::NewHandle(isolate, cls.library());
+  if (Dart_IsError(lib_handle)) {
+    Dart_PropagateError(lib_handle);
+  }
+  Dart_Handle lib_mirror = CreateLibraryMirror(lib_handle);
+  if (Dart_IsError(lib_mirror)) {
+    Dart_PropagateError(lib_mirror);
+  }
+  Dart_Handle result =  CreateClassMirror(cls_handle,
+                                          name_handle,
+                                          lib_handle,
+                                          lib_mirror);
+  if (Dart_IsError(result)) {
+    Dart_PropagateError(result);
+  }
+  return Api::UnwrapHandle(result);
+}
+
+
+// TODO(11742): At some point the function taking native parameters will get
+// default and one using Dart_Handles will disappear.

[rmacnak, 2013/07/17 22:27:50]

will replace

[Michael Lippautz (Google), 2013/07/17 22:43:19]

Done.

+static RawObject* CreateLibraryMirror(const Library& lib) {
+  Isolate* isolate = Isolate::Current();
+  DARTSCOPE(isolate);
+  Dart_Handle lib_handle = Api::NewHandle(isolate, lib.raw());
+  Dart_Handle result = CreateLibraryMirror(lib_handle);
+  if (Dart_IsError(result)) {
+    Dart_PropagateError(result);
+  }
+  return Api::UnwrapHandle(result);
+}
+
+
+// TODO(11742): At some point the function taking native parameters will get
+// default and one using Dart_Handles will disappear.

[rmacnak, 2013/07/17 22:27:50]

will replace

[Michael Lippautz (Google), 2013/07/17 22:43:19]

Done.

+static RawObject* CreateMethodMirror(const Function& func,
+                                     const Instance& owner) {
+  Isolate* isolate = Isolate::Current();
+  DARTSCOPE(isolate);
+  Dart_Handle func_handle = Api::NewHandle(isolate, func.raw());
+  Dart_Handle result = CreateMethodMirror(func_handle, Dart_Null());
+  if (Dart_IsError(result)) {
+    Dart_PropagateError(result);
+  }
+  return Api::UnwrapHandle(result);
+}
+
+
 void NATIVE_ENTRY_FUNCTION(Mirrors_makeLocalMirrorSystem)(
     Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle mirrors = CreateMirrorSystem();
   if (Dart_IsError(mirrors)) {
     Dart_PropagateError(mirrors);
   }
   Dart_SetReturnValue(args, mirrors);
   Dart_ExitScope();
 }
@@ skipping 753 matching lines @@
 
 
 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();
 }
 
+
+DEFINE_NATIVE_ENTRY(MethodMirror_owner, 1) {
+  const MirrorReference& func_ref =
+      MirrorReference::CheckedHandle(arguments->NativeArgAt(0));
+  Function& func = Function::Handle();
+  func ^= func_ref.referent();
+  if (func.IsNonImplicitClosureFunction()) {
+    return CreateMethodMirror(Function::Handle(
+        func.parent_function()), Instance::Handle(Instance::null()));
+  }
+  const Class& owner = Class::Handle(func.Owner());
+  if (owner.IsTopLevel()) {
+    return CreateLibraryMirror(Library::Handle(owner.library()));
+  }
+  return CreateClassMirror(owner);
+}
+
 }  // namespace dart