Deal with type arguments of generic local functions in VM mirrors.

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 "lib/mirrors.h"
 
 #include "lib/invocation_mirror.h"
 #include "vm/bootstrap_natives.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
@@ skipping 222 matching lines @@
 static RawInstance* CreateFunctionTypeMirror(const Class& cls,
                                              const AbstractType& type) {
   const Array& args = Array::Handle(Array::New(2));
   args.SetAt(0, MirrorReference::Handle(MirrorReference::New(cls)));
   args.SetAt(1, type);
   return CreateMirror(Symbols::_LocalFunctionTypeMirror(), args);
 }
 
 
 static RawInstance* CreateMethodMirror(const Function& func,
-                                       const Instance& owner_mirror) {
-  const Array& args = Array::Handle(Array::New(12));
+                                       const Instance& owner_mirror,
+                                       const AbstractType& instantiator) {
+  const Array& args = Array::Handle(Array::New(13));
   args.SetAt(0, MirrorReference::Handle(MirrorReference::New(func)));
 
   String& name = String::Handle(func.name());
   name = String::IdentifierPrettyNameRetainPrivate(name);
   args.SetAt(1, name);
 
   args.SetAt(2, owner_mirror);
-  args.SetAt(3, Bool::Get(func.is_static()));
-  args.SetAt(4, Bool::Get(func.is_abstract()));
-  args.SetAt(5, Bool::Get(func.IsGetterFunction()));
-  args.SetAt(6, Bool::Get(func.IsSetterFunction()));
+  args.SetAt(3, instantiator);
+  args.SetAt(4, Bool::Get(func.is_static()));
+  args.SetAt(5, Bool::Get(func.is_abstract()));
+  args.SetAt(6, Bool::Get(func.IsGetterFunction()));
+  args.SetAt(7, Bool::Get(func.IsSetterFunction()));
 
   bool isConstructor = (func.kind() == RawFunction::kConstructor);
-  args.SetAt(7, Bool::Get(isConstructor));
-  args.SetAt(8, Bool::Get(isConstructor && func.is_const()));
-  args.SetAt(9, Bool::Get(isConstructor && func.IsGenerativeConstructor()));
-  args.SetAt(10, Bool::Get(isConstructor && func.is_redirecting()));
-  args.SetAt(11, Bool::Get(isConstructor && func.IsFactory()));
+  args.SetAt(8, Bool::Get(isConstructor));
+  args.SetAt(9, Bool::Get(isConstructor && func.is_const()));
+  args.SetAt(10, Bool::Get(isConstructor && func.IsGenerativeConstructor()));
+  args.SetAt(11, Bool::Get(isConstructor && func.is_redirecting()));
+  args.SetAt(12, Bool::Get(isConstructor && func.IsFactory()));
 
   return CreateMirror(Symbols::_LocalMethodMirror(), args);
 }
 
 
 static RawInstance* CreateVariableMirror(const Field& field,
                                          const Instance& owner_mirror) {
   const MirrorReference& field_ref =
       MirrorReference::Handle(MirrorReference::New(field));
 
@@ skipping 471 matching lines @@
 
 static RawAbstractType* InstantiateType(const AbstractType& type,
                                         const AbstractType& instantiator) {
   ASSERT(type.IsFinalized());
   ASSERT(!type.IsMalformed());
 
   if (type.IsInstantiated()) {
     return type.Canonicalize();
   }
 
+  if (instantiator.IsNull()) {
+    return type.Canonicalize();
+  }
   ASSERT(!instantiator.IsNull());
   ASSERT(instantiator.IsFinalized());
   ASSERT(!instantiator.IsMalformed());
 
   const TypeArguments& type_args =
       TypeArguments::Handle(instantiator.arguments());
   Error& bound_error = Error::Handle();
   AbstractType& result =
       AbstractType::Handle(type.InstantiateFrom(type_args, &bound_error));
   if (!bound_error.IsNull()) {
@@ skipping 93 matching lines @@
 
 
 DEFINE_NATIVE_ENTRY(FunctionTypeMirror_call_method, 2) {
   GET_NON_NULL_NATIVE_ARGUMENT(Instance,
                                owner_mirror,
                                arguments->NativeArgAt(0));
   GET_NON_NULL_NATIVE_ARGUMENT(MirrorReference, ref, arguments->NativeArgAt(1));
   const Class& cls = Class::Handle(ref.GetClassReferent());
   const Function& func = Function::Handle(CallMethod(cls));
   ASSERT(!func.IsNull());
-  return CreateMethodMirror(func, owner_mirror);
+  return CreateMethodMirror(func, owner_mirror, AbstractType::Handle());
 }
 
 
 DEFINE_NATIVE_ENTRY(FunctionTypeMirror_parameters, 2) {
   GET_NON_NULL_NATIVE_ARGUMENT(Instance, owner, arguments->NativeArgAt(0));
   GET_NON_NULL_NATIVE_ARGUMENT(MirrorReference, ref, arguments->NativeArgAt(1));
   const Class& cls = Class::Handle(ref.GetClassReferent());
   const Function& func = Function::Handle(cls.signature_function());
   return CreateParameterMirrorList(func, owner);
 }
@@ skipping 124 matching lines @@
   const Class& cls = Class::Handle(type.type_class());
   const AbstractType& mixin_type = AbstractType::Handle(cls.mixin());
   if (mixin_type.IsNull()) {
     return mixin_type.raw();
   }
 
   return InstantiateType(mixin_type, instantiator);
 }
 
 
-DEFINE_NATIVE_ENTRY(ClassMirror_members, 2) {
+DEFINE_NATIVE_ENTRY(ClassMirror_members, 3) {
   GET_NON_NULL_NATIVE_ARGUMENT(Instance,
                                owner_mirror,
                                arguments->NativeArgAt(0));
-  GET_NON_NULL_NATIVE_ARGUMENT(MirrorReference, ref, arguments->NativeArgAt(1));
+  GET_NATIVE_ARGUMENT(AbstractType,
+                      owner_instantiator,
+                      arguments->NativeArgAt(1));
+  GET_NON_NULL_NATIVE_ARGUMENT(MirrorReference, ref, arguments->NativeArgAt(2));
   const Class& klass = Class::Handle(ref.GetClassReferent());
 
   const Error& error = Error::Handle(klass.EnsureIsFinalized(isolate));
   if (!error.IsNull()) {
     Exceptions::PropagateError(error);
   }
 
   const Array& fields = Array::Handle(klass.fields());
   const intptr_t num_fields = fields.Length();
 
@@ skipping 13 matching lines @@
     }
   }
 
   Function& func = Function::Handle();
   for (intptr_t i = 0; i < num_functions; i++) {
     func ^= functions.At(i);
     if (func.is_reflectable() &&
         (func.kind() == RawFunction::kRegularFunction ||
         func.kind() == RawFunction::kGetterFunction ||
         func.kind() == RawFunction::kSetterFunction)) {
-      member_mirror = CreateMethodMirror(func, owner_mirror);
+      member_mirror = CreateMethodMirror(func, owner_mirror,
+                                         owner_instantiator);
       member_mirrors.Add(member_mirror);
     }
   }
 
   return member_mirrors.raw();
 }
 
 
-DEFINE_NATIVE_ENTRY(ClassMirror_constructors, 2) {
+DEFINE_NATIVE_ENTRY(ClassMirror_constructors, 3) {
   GET_NON_NULL_NATIVE_ARGUMENT(Instance,
                                owner_mirror,
                                arguments->NativeArgAt(0));
-  GET_NON_NULL_NATIVE_ARGUMENT(MirrorReference, ref, arguments->NativeArgAt(1));
+  GET_NATIVE_ARGUMENT(AbstractType,
+                      owner_instantiator,
+                      arguments->NativeArgAt(1));
+  GET_NON_NULL_NATIVE_ARGUMENT(MirrorReference, ref, arguments->NativeArgAt(2));
   const Class& klass = Class::Handle(ref.GetClassReferent());
 
   const Error& error = Error::Handle(klass.EnsureIsFinalized(isolate));
   if (!error.IsNull()) {
     Exceptions::PropagateError(error);
   }
 
   const Array& functions = Array::Handle(klass.functions());
   const intptr_t num_functions = functions.Length();
 
   Instance& constructor_mirror = Instance::Handle();
   const GrowableObjectArray& constructor_mirrors = GrowableObjectArray::Handle(
       GrowableObjectArray::New(num_functions));
 
   Function& func = Function::Handle();
   for (intptr_t i = 0; i < num_functions; i++) {
     func ^= functions.At(i);
     if (func.is_reflectable() && func.kind() == RawFunction::kConstructor) {
-      constructor_mirror = CreateMethodMirror(func, owner_mirror);
+      constructor_mirror = CreateMethodMirror(func, owner_mirror,
+                                              owner_instantiator);
       constructor_mirrors.Add(constructor_mirror);
     }
   }
 
   return constructor_mirrors.raw();
 }
 
 
 DEFINE_NATIVE_ENTRY(LibraryMirror_members, 2) {
   GET_NON_NULL_NATIVE_ARGUMENT(Instance,
@@ skipping 34 matching lines @@
       if (!field.is_synthetic()) {
         member_mirror = CreateVariableMirror(field, owner_mirror);
         member_mirrors.Add(member_mirror);
       }
     } else if (entry.IsFunction()) {
       const Function& func = Function::Cast(entry);
       if (func.is_reflectable() &&
           (func.kind() == RawFunction::kRegularFunction ||
           func.kind() == RawFunction::kGetterFunction ||
           func.kind() == RawFunction::kSetterFunction)) {
-        member_mirror = CreateMethodMirror(func, owner_mirror);
+        member_mirror = CreateMethodMirror(func, owner_mirror,
+                                           AbstractType::Handle());
         member_mirrors.Add(member_mirror);
       }
     }
   }
 
   return member_mirrors.raw();
 }
 
 
 DEFINE_NATIVE_ENTRY(ClassMirror_type_variables, 1) {
@@ skipping 229 matching lines @@
   Function& function = Function::Handle();
   bool callable = closure.IsCallable(&function);
   if (callable) {
     if (function.IsImplicitClosureFunction()) {
       // The VM uses separate Functions for tear-offs, but the mirrors consider
       // the tear-offs to be the same as the torn-off methods. Avoid handing out
       // a reference to the tear-off here to avoid a special case in the
       // the equality test.
       function = function.parent_function();
     }
-    return CreateMethodMirror(function, Instance::null_instance());
+
+    Type& instantiator = Type::Handle();
+    if (closure.IsClosure()) {
+      const TypeArguments& arguments =
+          TypeArguments::Handle(Closure::GetTypeArguments(closure));
+      const Class& cls =
+          Class::Handle(Isolate::Current()->object_store()->object_class());
+      instantiator = Type::New(cls, arguments, Scanner::kNoSourcePos);
+      instantiator.SetIsFinalized();
+    }
+    return CreateMethodMirror(function,
+                              Instance::null_instance(),
+                              instantiator);
   }
   return Instance::null();
 }
 
 
 DEFINE_NATIVE_ENTRY(ClassMirror_invoke, 5) {
   // Argument 0 is the mirror, which is unused by the native. It exists
   // because this native is an instance method in order to be polymorphic
   // with its cousins.
   GET_NON_NULL_NATIVE_ARGUMENT(MirrorReference, ref, arguments->NativeArgAt(1));
@@ skipping 424 matching lines @@
                       InvocationMirror::kTopLevel,
                       InvocationMirror::kSetter);
     UNREACHABLE();
   }
 
   field.set_value(value);
   return value.raw();
 }
 
 
-DEFINE_NATIVE_ENTRY(MethodMirror_owner, 1) {
+DEFINE_NATIVE_ENTRY(MethodMirror_owner, 2) {
   GET_NON_NULL_NATIVE_ARGUMENT(MirrorReference, ref, arguments->NativeArgAt(0));
+  GET_NATIVE_ARGUMENT(AbstractType, instantiator, arguments->NativeArgAt(1));
   const Function& func = Function::Handle(ref.GetFunctionReferent());
   if (func.IsNonImplicitClosureFunction()) {
     return CreateMethodMirror(Function::Handle(
-        func.parent_function()), Object::null_instance());
+        func.parent_function()), Object::null_instance(), instantiator);
   }
   const Class& owner = Class::Handle(func.Owner());
   if (owner.IsTopLevel()) {
     return CreateLibraryMirror(Library::Handle(owner.library()));
   }
 
   AbstractType& type = AbstractType::Handle(owner.DeclarationType());
   return CreateClassMirror(owner, type, Bool::True(), Object::null_instance());
 }
 
@@ skipping 199 matching lines @@
 }
 
 DEFINE_NATIVE_ENTRY(TypeMirror_moreSpecificTest, 2) {
   GET_NON_NULL_NATIVE_ARGUMENT(AbstractType, a, arguments->NativeArgAt(0));
   GET_NON_NULL_NATIVE_ARGUMENT(AbstractType, b, arguments->NativeArgAt(1));
   return Bool::Get(a.IsMoreSpecificThan(b, NULL)).raw();
 }
 
 
 }  // namespace dart