Inline CreateLibraryMirror.

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 384 matching lines @@
   args.SetAt(1, name);
   args.SetAt(2, owner_mirror);
   args.SetAt(3, Instance::Handle());  // Null for type.
   args.SetAt(4, field.is_static() ? Bool::True() : Bool::False());
   args.SetAt(5, field.is_final()  ? Bool::True() : Bool::False());
 
   return CreateMirror(Symbols::_LocalVariableMirrorImpl(), args);
 }
 
 
-static Dart_Handle CreateLibraryMirrorUsingApi(Dart_Handle lib) {
-  Dart_Handle cls_name = NewString("_LocalLibraryMirrorImpl");
-  Dart_Handle type = Dart_GetType(MirrorLib(), cls_name, 0, NULL);
-  if (Dart_IsError(type)) {
-    return type;
-  }
-  Dart_Handle lazy_lib_mirror = CreateLazyMirror(lib);
-  if (Dart_IsError(lazy_lib_mirror)) {
-    return lazy_lib_mirror;
-  }
-  Dart_Handle args[] = {
-    CreateMirrorReference(lib),
-    Dart_LibraryName(lib),
-    Dart_LibraryUrl(lib),
-  };
-  Dart_Handle lib_mirror = Dart_New(type, Dart_Null(), ARRAY_SIZE(args), args);
-  if (Dart_IsError(lib_mirror)) {
-    return lib_mirror;
-  }
-
-  return lib_mirror;
-}
-
-
 static RawInstance* CreateClassMirror(const Class& cls,
                                       const Instance& owner_mirror) {
   Instance& retvalue = Instance::Handle();
   Dart_EnterScope();
   Isolate* isolate = Isolate::Current();
   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_mirror = Api::NewHandle(isolate, owner_mirror.raw());
   // TODO(11742): At some point the handle calls will be replaced by inlined
   // functionality.
   Dart_Handle result =  CreateClassMirrorUsingApi(cls_handle,
                                                   name_handle,
                                                   lib_mirror);
   if (Dart_IsError(result)) {
     Dart_PropagateError(result);
   }
   retvalue ^= Api::UnwrapHandle(result);
   Dart_ExitScope();
   return retvalue.raw();
 }
 
 
 static RawInstance* CreateLibraryMirror(const Library& lib) {
-  Instance& retvalue = Instance::Handle();
-  Dart_EnterScope();
-  Isolate* isolate = Isolate::Current();
-  Dart_Handle lib_handle = Api::NewHandle(isolate, lib.raw());
-  // TODO(11742): At some point the handle calls will be replaced by inlined
-  // functionality.
-  Dart_Handle result = CreateLibraryMirrorUsingApi(lib_handle);
-  if (Dart_IsError(result)) {
-    Dart_PropagateError(result);
-  }
-  retvalue ^= Api::UnwrapHandle(result);
-  Dart_ExitScope();
-  return retvalue.raw();
+  const Array& args = Array::Handle(Array::New(3));
+  args.SetAt(0, MirrorReference::Handle(MirrorReference::New(lib)));
+  args.SetAt(1, String::Handle(lib.name()));
+  args.SetAt(2, String::Handle(lib.url()));

[siva, 2013/07/30 20:42:27]

Small nit, you could save one Handle here by doing;

String& str = String::Handle();
str = lib.name();
args.Set(1, str);
str = lib.url();
args.Set(2, str);

[Michael Lippautz (Google), 2013/07/30 20:52:14]

Done.

+  return CreateMirror(Symbols::_LocalLibraryMirrorImpl(), args);
 }
 
 
 static RawInstance* CreateTypeMirror(const AbstractType& type) {
   ASSERT(!type.IsMalformed());
   if (type.HasResolvedTypeClass()) {
     const Class& cls = Class::Handle(type.type_class());
     // Handle void and dynamic types.
     if (cls.IsVoidClass()) {
       Array& args = Array::Handle(Array::New(1));
@@ skipping 960 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