Handle creating ParameterMirrors for the parameters of forwarding constructors.

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/invocation_mirror.h"
 #include "vm/bootstrap_natives.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart_entry.h"
 #include "vm/exceptions.h"
@@ skipping 111 matching lines @@
   const intptr_t implicit_param_count = func.NumImplicitParameters();
   const intptr_t non_implicit_param_count = func.NumParameters() -
                                             implicit_param_count;
   const intptr_t index_of_first_optional_param =
       non_implicit_param_count - func.NumOptionalParameters();
   const intptr_t index_of_first_named_param =
       non_implicit_param_count - func.NumOptionalNamedParameters();
   const Array& results = Array::Handle(Array::New(non_implicit_param_count));
   const Array& args = Array::Handle(Array::New(9));
 
-  // Return for synthetic functions and getters.
-  if (func.IsGetterFunction() ||
-      func.IsImplicitConstructor() ||
-      func.IsImplicitGetterFunction() ||
-      func.IsImplicitSetterFunction()) {
-    return results.raw();
-  }
-
   Smi& pos = Smi::Handle();
   String& name = String::Handle();
   Instance& param = Instance::Handle();
   Bool& is_final = Bool::Handle();
   Object& default_value = Object::Handle();
   Object& metadata = Object::Handle();
 
   // We force compilation of constructors to ensure the types of initializing
   // formals have been corrected. We do not force the compilation of all types
   // of functions because some have no body, e.g. signature functions.
   EnsureConstructorsAreCompiled(func);
 
-  // Reparse the function for the following information:
-  // * The default value of a parameter.
-  // * Whether a parameters has been deflared as final.
-  // * Any metadata associated with the parameter.
-  const Object& result = Object::Handle(Parser::ParseFunctionParameters(func));
-  if (result.IsError()) {
-    ThrowInvokeError(Error::Cast(result));
-    UNREACHABLE();
+  bool has_extra_parameter_info = true;
+  if (non_implicit_param_count == 0) {
+    has_extra_parameter_info = false;
+  }
+  if (func.IsImplicitConstructor()) {
+    // This covers the default constructor and forwarding constructors.
+    has_extra_parameter_info = false;
+  }
+
+  Array& param_descriptor = Array::Handle();
+  if (has_extra_parameter_info) {
+    // Reparse the function for the following information:
+    // * The default value of a parameter.
+    // * Whether a parameters has been deflared as final.
+    // * Any metadata associated with the parameter.
+    const Object& result =
+        Object::Handle(Parser::ParseFunctionParameters(func));
+    if (result.IsError()) {
+      ThrowInvokeError(Error::Cast(result));
+      UNREACHABLE();
+    }
+    param_descriptor ^= result.raw();
+    ASSERT(param_descriptor.Length() ==
+           (Parser::kParameterEntrySize * non_implicit_param_count));
   }
 
   args.SetAt(0, MirrorReference::Handle(MirrorReference::New(func)));
   args.SetAt(2, owner_mirror);
 
-  const Array& param_descriptor = Array::Cast(result);
-  ASSERT(param_descriptor.Length() ==
-         (Parser::kParameterEntrySize * non_implicit_param_count));
+  if (!has_extra_parameter_info) {
+    is_final ^= Bool::True().raw();
+    default_value = Object::null();
+    metadata = Object::null();
+  }
+
   for (intptr_t i = 0; i < non_implicit_param_count; i++) {
     pos ^= Smi::New(i);
     name ^= func.ParameterNameAt(implicit_param_count + i);
-    is_final ^= param_descriptor.At(
-        i * Parser::kParameterEntrySize + Parser::kParameterIsFinalOffset);
-    default_value = param_descriptor.At(
-        i * Parser::kParameterEntrySize + Parser::kParameterDefaultValueOffset);
-    metadata = param_descriptor.At(
-        i * Parser::kParameterEntrySize + Parser::kParameterMetadataOffset);
-
+    if (has_extra_parameter_info) {
+      is_final ^= param_descriptor.At(i * Parser::kParameterEntrySize +
+          Parser::kParameterIsFinalOffset);
+      default_value = param_descriptor.At(i * Parser::kParameterEntrySize +
+          Parser::kParameterDefaultValueOffset);
+      metadata = param_descriptor.At(i * Parser::kParameterEntrySize +
+          Parser::kParameterMetadataOffset);
+    }
     ASSERT(default_value.IsNull() || default_value.IsInstance());
 
     // Arguments 0 (referent) and 2 (owner) are the same for all parameters. See
     // above.
     args.SetAt(1, name);
     args.SetAt(3, pos);
     args.SetAt(4, Bool::Get(i >= index_of_first_optional_param));
     args.SetAt(5, Bool::Get(i >= index_of_first_named_param));
     args.SetAt(6, is_final);
     args.SetAt(7, default_value);
@@ skipping 154 matching lines @@
     ThrowInvokeError(error);
     UNREACHABLE();
   }
 
   const Bool& is_generic = Bool::Get(cls.NumTypeParameters() != 0);
   const Bool& is_mixin_app_alias = Bool::Get(cls.is_mixin_app_alias());
 
   const Array& args = Array::Handle(Array::New(8));
   args.SetAt(0, MirrorReference::Handle(MirrorReference::New(cls)));
   args.SetAt(1, type);
-  // We do not set the names of anonymous mixin applications because the mirrors
+  // Note that the VM does not consider mixin application aliases to be mixin
+  // applications, so this only covers anonymous mixin applications. We do not
+  // set the names of anonymous mixin applications here because the mirrors
   // use a different naming convention than the VM (lib.S with lib.M and S&M
   // respectively).
-  if (!cls.IsAnonymousMixinApplication()) {
+  if (!cls.IsMixinApplication()) {
     args.SetAt(2, String::Handle(cls.Name()));
   }
   args.SetAt(3, owner_mirror);
   args.SetAt(4, Bool::Get(cls.is_abstract()));
   args.SetAt(5, is_generic);
   args.SetAt(6, is_mixin_app_alias);
   args.SetAt(7, cls.NumTypeParameters() == 0 ? Bool::False() : is_declaration);
   return CreateMirror(Symbols::_LocalClassMirror(), args);
 }
 
@@ skipping 941 matching lines @@
   DictionaryIterator entries(library);
 
   AbstractType& type = AbstractType::Handle();
 
   while (entries.HasNext()) {
     entry = entries.GetNext();
     if (entry.IsClass()) {
       const Class& klass = Class::Cast(entry);
       // We filter out function signature classes and dynamic.
       // TODO(12478): Should not need to filter out dynamic.
+      // Note that the VM does not consider mixin application aliases to be
+      // mixin applications.
       if (!klass.IsCanonicalSignatureClass() &&
           !klass.IsDynamicClass() &&
-          !klass.IsAnonymousMixinApplication()) {
+          !klass.IsMixinApplication()) {
         type = klass.DeclarationType();
         member_mirror = CreateClassMirror(klass,
                                           type,
                                           Bool::True(),  // is_declaration
                                           owner_mirror);
         member_mirrors.Add(member_mirror);
       }
     } else if (entry.IsField()) {
       const Field& field = Field::Cast(entry);
       member_mirror = CreateVariableMirror(field, owner_mirror);
@@ skipping 900 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