Make ClassMirror.typeVariables lazy and convert dependencies to native code.

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"
 #include "lib/invocation_mirror.h"
 
 namespace dart {
 
+static void ThrowInvokeError(const Error& error);
+
 static RawInstance* CreateMirror(const String& mirror_class_name,
                                  const Array& constructor_arguments) {
   const Library& mirrors_lib = Library::Handle(Library::MirrorsLibrary());
   const String& constructor_name = Symbols::Dot();
 
   const Object& result = Object::Handle(
       DartLibraryCalls::InstanceCreate(mirrors_lib,
                                        mirror_class_name,
                                        constructor_name,
                                        constructor_arguments));
-  ASSERT(result.IsInstance());
+#ifdef DEBUG
+  if (result.IsError()) {
+    ThrowInvokeError(Error::Cast(result));
+  }
+#endif  // DEBUG

[siva, 2013/07/26 22:10:34]

Not sure I understand why ThrowInvokeError should be called only in debug mode?

Would it be sufficient to have
ASSERT(!result.IsError());

[Michael Lippautz (Google), 2013/07/26 23:30:07]

Done.

   return Instance::Cast(result).raw();
 }
 
 
 inline Dart_Handle NewString(const char* str) {
   return Dart_NewStringFromCString(str);
 }
 
 
 DEFINE_NATIVE_ENTRY(Mirrors_isLocalPort, 1) {
@@ skipping 308 matching lines @@
     }
     Dart_Handle result = Dart_ListSetAt(mirror_list, i, mirror);
     if (Dart_IsError(result)) {
       return result;
     }
   }
   return mirror_list;
 }
 
 
-static Dart_Handle CreateTypeVariableMirrorUsingApi(Dart_Handle type_var,
-                                                    Dart_Handle type_var_name,
-                                                    Dart_Handle owner_mirror) {
-  ASSERT(Dart_IsTypeVariable(type_var));
-  Dart_Handle cls_name = NewString("_LocalTypeVariableMirrorImpl");
-  Dart_Handle type = Dart_GetType(MirrorLib(), cls_name, 0, NULL);
-  if (Dart_IsError(type)) {
-    return type;
-  }
-
-  Dart_Handle upper_bound = Dart_TypeVariableUpperBound(type_var);
-  if (Dart_IsError(upper_bound)) {
-    return upper_bound;
-  }
-
-  Dart_Handle args[] = {
-    CreateMirrorReference(type_var),
-    type_var_name,
-    owner_mirror,
-    CreateLazyMirror(upper_bound),
-  };
-  Dart_Handle mirror = Dart_New(type, Dart_Null(), ARRAY_SIZE(args), args);
-  return mirror;
-}
-
-
 static RawInstance* CreateTypeVariableMirror(const TypeParameter& param,
                                              const Instance& owner_mirror) {
-  Instance& retvalue = Instance::Handle();
-  Dart_EnterScope();
-  Isolate* isolate = Isolate::Current();
-  Dart_Handle param_handle = Api::NewHandle(isolate, param.raw());
-  if (Dart_IsError(param_handle)) {
-    Dart_PropagateError(param_handle);
-  }
-  Dart_Handle name_handle = Api::NewHandle(isolate, param.Name());
-  if (Dart_IsError(name_handle)) {
-    Dart_PropagateError(name_handle);
-  }
-  // Until we get rid of lazy mirrors, we must have owners.
-  Dart_Handle owner_handle;
-  if (owner_mirror.IsNull()) {
-    owner_handle = Api::NewHandle(isolate, param.parameterized_class());
-    if (Dart_IsError(owner_handle)) {
-      Dart_PropagateError(owner_handle);
-    }
-    owner_handle = CreateLazyMirror(owner_handle);
-    if (Dart_IsError(owner_handle)) {
-      Dart_PropagateError(owner_handle);
-    }
-  } else {
-    owner_handle = Api::NewHandle(isolate, owner_mirror.raw());
-    if (Dart_IsError(owner_handle)) {
-      Dart_PropagateError(owner_handle);
-    }
-  }
-  // TODO(11742): At some point the handle calls will be replaced by inlined
-  // functionality.
-  Dart_Handle result =  CreateTypeVariableMirrorUsingApi(param_handle,
-                                                         name_handle,
-                                                         owner_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, param);
+  args.SetAt(1, String::Handle(param.name()));
+  args.SetAt(2, owner_mirror);
+  return CreateMirror(Symbols::_LocalTypeVariableMirrorImpl(), args);
 }
 
 
-static Dart_Handle CreateTypeVariableMap(Dart_Handle owner,
-                                         Dart_Handle owner_mirror) {
-  ASSERT(Dart_IsClass(owner));
-  // TODO(turnidge): This should be an immutable map.
-  Dart_Handle map = MapNew();
-  if (Dart_IsError(map)) {
-    return map;
+// We create a list in native code and let Dart code create the actual ordered
+// map then.

[siva, 2013/07/26 22:10:34]

"let Dart code create the type mirror object and the ordered map."

[Michael Lippautz (Google), 2013/07/26 23:30:07]

Done.

+static RawInstance* CreateTypeVariableList(const Class& cls) {
+  ASSERT(cls.IsClass());

[siva, 2013/07/26 22:10:34]

The function prototype states it is Class handle so why do you need to assert
again?

[Michael Lippautz (Google), 2013/07/26 23:30:07]

Removed.

+  TypeArguments& args = TypeArguments::Handle(cls.type_parameters());
+  const Array& result = Array::Handle(Array::New(args.Length() * 2));
+  TypeParameter& type = TypeParameter::Handle();
+  String& name = String::Handle();
+  for (intptr_t i = 0; i < result.Length(); i += 2) {
+    type ^= args.TypeAt(i);
+    ASSERT(type.IsTypeParameter());
+    name ^= type.name();
+    result.SetAt(i, name);
+    result.SetAt(i + 1, type);
   }
-
-  Dart_Handle names = Dart_GetTypeVariableNames(owner);
-  if (Dart_IsError(names)) {
-    return names;
-  }
-  intptr_t len;
-  Dart_Handle result = Dart_ListLength(names, &len);
-  if (Dart_IsError(result)) {
-    return result;
-  }
-  for (intptr_t i = 0; i < len; i++) {
-    Dart_Handle type_var_name = Dart_ListGetAt(names, i);
-    Dart_Handle type_var = Dart_LookupTypeVariable(owner, type_var_name);
-    if (Dart_IsError(type_var)) {
-      return type_var;
-    }
-    ASSERT(!Dart_IsNull(type_var));
-    Dart_Handle type_var_mirror =
-        CreateTypeVariableMirrorUsingApi(type_var, type_var_name, owner_mirror);
-    if (Dart_IsError(type_var_mirror)) {
-      return type_var_mirror;
-    }
-    result = MapAdd(map, type_var_name, type_var_mirror);
-    if (Dart_IsError(result)) {
-      return result;
-    }
-  }
-  return map;
+  return result.raw();
 }
 
 
 static Dart_Handle CreateTypedefMirror(Dart_Handle cls,
                                        Dart_Handle cls_name,
                                        Dart_Handle owner_mirror) {
   Dart_Handle mirror_cls_name = NewString("_LocalTypedefMirrorImpl");
   Dart_Handle mirror_type = Dart_GetType(MirrorLib(), mirror_cls_name, 0, NULL);
   if (Dart_IsError(mirror_type)) {
     return mirror_type;
@@ skipping 45 matching lines @@
   Dart_Handle default_class = Dart_Null();
 
   Dart_Handle intf_mirror = CreateLazyMirror(intf);
   if (Dart_IsError(intf_mirror)) {
     return intf_mirror;
   }
   Dart_Handle constructor_map = CreateConstructorMap(intf, intf_mirror);
   if (Dart_IsError(constructor_map)) {
     return constructor_map;
   }
-  Dart_Handle type_var_map = CreateTypeVariableMap(intf, intf_mirror);
-  if (Dart_IsError(type_var_map)) {
-    return type_var_map;
-  }
 
   Dart_Handle args[] = {
     CreateMirrorReference(intf),
     Dart_Null(),  // "name"
     Dart_NewBoolean(Dart_IsClass(intf)),
     lib_mirror,
     CreateLazyMirror(super_class),
     CreateImplementsList(intf),
     CreateLazyMirror(default_class),
-    constructor_map,
-    type_var_map,
+    constructor_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));
   args.SetAt(0, MirrorReference::Handle(MirrorReference::New(func)));
@@ skipping 564 matching lines @@
         member_mirror = CreateMethodMirror(func, owner_mirror);
         member_mirrors.Add(member_mirror);
       }
     }
   }
 
   return member_mirrors.raw();
 }
 
 
+DEFINE_NATIVE_ENTRY(ClassMirror_type_variables, 1) {
+  GET_NON_NULL_NATIVE_ARGUMENT(MirrorReference, ref, arguments->NativeArgAt(0));
+  const Class& klass = Class::Handle(ref.GetClassReferent());
+  return CreateTypeVariableList(klass);
+}
+
+
+DEFINE_NATIVE_ENTRY(LocalTypeVariableMirror_owner, 1) {
+  GET_NON_NULL_NATIVE_ARGUMENT(TypeParameter, param, arguments->NativeArgAt(0));
+  return CreateClassMirror(Class::Handle(param.parameterized_class()),
+                           Instance::null_instance());
+}
+
+
+DEFINE_NATIVE_ENTRY(LocalTypeVariableMirror_upper_bound, 1) {
+  GET_NON_NULL_NATIVE_ARGUMENT(TypeParameter, param, arguments->NativeArgAt(0));
+  return CreateTypeMirror(AbstractType::Handle(param.bound()));
+}
+
+
 // Invoke the function, or noSuchMethod if it is null. Propagate any unhandled
 // exceptions. Wrap and propagate any compilation errors.
 static RawObject* ReflectivelyInvokeDynamicFunction(const Instance& receiver,
                                                     const Function& function,
                                                     const String& target_name,
                                                     const Array& arguments) {
   // Note "arguments" is already the internal arguments with the receiver as
   // the first element.
   Object& result = Object::Handle();
   if (function.IsNull()) {
@@ skipping 617 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