Ensure FunctionTypeMirrors have a proper reflectee and implement ClassMirror.superinterfaces with i…

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 273 matching lines @@
       Dart_Handle cls_name = NewString("_LazyFunctionTypeMirror");
       Dart_Handle type = Dart_GetType(MirrorLib(), cls_name, 0, NULL);
 
       Dart_Handle sig = Dart_ClassGetFunctionTypeSignature(target);
       Dart_Handle return_type = Dart_FunctionReturnType(sig);
       if (Dart_IsError(return_type)) {
         return return_type;
       }
 
       Dart_Handle args[] = {
+        CreateMirrorReference(target),
         CreateLazyMirror(return_type),
         CreateParameterMirrorListUsingApi(sig),
       };
       return Dart_New(type, Dart_Null(), ARRAY_SIZE(args), args);
     } else {
       Dart_Handle cls_name = NewString("_LazyTypeMirror");
       Dart_Handle type = Dart_GetType(MirrorLib(), cls_name, 0, NULL);
       Dart_Handle lib = Dart_ClassGetLibrary(target);
       Dart_Handle lib_url;
       if (Dart_IsNull(lib)) {
@@ skipping 16 matching lines @@
 
     Dart_Handle args[] = { var_name, owner_mirror };
     return Dart_New(type, Dart_Null(), ARRAY_SIZE(args), args);
   }
 
   UNREACHABLE();
   return Dart_Null();
 }
 
 
-static Dart_Handle CreateImplementsList(Dart_Handle intf) {
-  intptr_t len = 0;
-  Dart_Handle result = Dart_ClassGetInterfaceCount(intf, &len);
-  if (Dart_IsError(result)) {
-    return result;
-  }
-
-  Dart_Handle mirror_list = Dart_NewList(len);
-  if (Dart_IsError(mirror_list)) {
-    return mirror_list;
-  }
-
-  for (intptr_t i = 0; i < len; i++) {
-    Dart_Handle interface = Dart_ClassGetInterfaceAt(intf, i);
-    if (Dart_IsError(interface)) {
-      return interface;
-    }
-    Dart_Handle mirror = CreateLazyMirror(interface);
-    if (Dart_IsError(mirror)) {
-      return mirror;
-    }
-    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;
   }
 
@@ skipping 131 matching lines @@
     // reflection.
     return CreateTypedefMirror(intf, intf_name, lib_mirror);
   }
 
   Dart_Handle cls_name = NewString("_LocalClassMirrorImpl");
   Dart_Handle type = Dart_GetType(MirrorLib(), cls_name, 0, NULL);
   if (Dart_IsError(type)) {
     return type;
   }
 
-  Dart_Handle super_class = Dart_Null();
-  // TODO(turnidge): Simplify code, now that default classes have been removed.
-  Dart_Handle default_class = Dart_Null();
-
   Dart_Handle intf_mirror = CreateLazyMirror(intf);
   if (Dart_IsError(intf_mirror)) {
     return intf_mirror;
   }
   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,
-    super_class,
-    CreateImplementsList(intf),
-    CreateLazyMirror(default_class),
     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));
@@ skipping 421 matching lines @@
   return CreateLibraryMirror(Library::Handle(klass.library()));
 }
 
 
 DEFINE_NATIVE_ENTRY(ClassMirror_supertype, 1) {
   GET_NON_NULL_NATIVE_ARGUMENT(MirrorReference, ref, arguments->NativeArgAt(0));
   const Class& klass = Class::Handle(ref.GetClassReferent());
   return klass.super_type();
 }
 
+
+DEFINE_NATIVE_ENTRY(ClassMirror_interfaces, 1) {
+  GET_NON_NULL_NATIVE_ARGUMENT(MirrorReference, ref, arguments->NativeArgAt(0));
+  const Class& klass = Class::Handle(ref.GetClassReferent());
+
+  const Error& error = Error::Handle(klass.EnsureIsFinalized(isolate));
+  if (!error.IsNull()) {
+    ThrowInvokeError(error);
+  }
+
+  return klass.interfaces();
+}
+
+
 DEFINE_NATIVE_ENTRY(ClassMirror_members, 2) {
   GET_NON_NULL_NATIVE_ARGUMENT(Instance,
                                owner_mirror,
                                arguments->NativeArgAt(0));
   GET_NON_NULL_NATIVE_ARGUMENT(MirrorReference, ref, arguments->NativeArgAt(1));
   const Class& klass = Class::Handle(ref.GetClassReferent());
 
   const Error& error = Error::Handle(klass.EnsureIsFinalized(isolate));
   if (!error.IsNull()) {
     ThrowInvokeError(error);
@@ skipping 747 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