Add missing demangling to the VM's NoSuchMethodError. Ensure the NoSuchMethorError for reflective 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 "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 47 matching lines @@
 
 
 // Conventions:
 // * For throwing a NSM in a class klass we use its runtime type as receiver,
 //   i.e., klass.RareType().
 // * For throwing a NSM in a library, we just pass the null instance as
 //   receiver.
 static void ThrowNoSuchMethod(const Instance& receiver,
                               const String& function_name,
                               const Function& function,
+                              const Array& arguments,
                               const InvocationMirror::Call call,
                               const InvocationMirror::Type type) {
   const Smi& invocation_type = Smi::Handle(Smi::New(
       InvocationMirror::EncodeType(call, type)));
 
   const Array& args = Array::Handle(Array::New(6));
   args.SetAt(0, receiver);
   args.SetAt(1, function_name);
   args.SetAt(2, invocation_type);
-  // Parameter 3 (actual arguments): We omit this parameter to get the same
-  // error message as one would get by invoking the function non-reflectively.
-  // Parameter 4 (named arguments): We omit this parameters since we cannot
-  // invoke functions with named parameters reflectively (using mirrors).
+  args.SetAt(3, arguments);
+  // TODO(rmacnak): Argument 4 (attempted argument names).
   if (!function.IsNull()) {
     const intptr_t total_num_parameters = function.NumParameters();
     const Array& array = Array::Handle(Array::New(total_num_parameters));
     String& param_name = String::Handle();
     for (int i = 0; i < total_num_parameters; i++) {
       param_name = function.ParameterNameAt(i);
       array.SetAt(i, param_name);
     }
     args.SetAt(5, array);
   }
@@ skipping 562 matching lines @@
     // Invoke the getter and return the result.
     const Object& result = Object::Handle(
         DartEntry::InvokeFunction(getter, Object::empty_array()));
     return ReturnResult(result);
   }
 
   if (throw_nsm_if_absent) {
     ThrowNoSuchMethod(Instance::null_instance(),
                       getter_name,
                       getter,
+                      Array::Handle(),

[siva, 2014/06/12 16:59:07]

Use Object::null_array() instead of creating a new empty handle

[rmacnak, 2014/06/12 22:52:08]

Done.

                       InvocationMirror::kTopLevel,
                       InvocationMirror::kGetter);
     UNREACHABLE();
   }
 
   // Fall through case: Indicate that we didn't find any function or field using
   // a special null instance. This is different from a field being null. Callers
   // make sure that this null does not leak into Dartland.
   return Object::sentinel().raw();
 }
@@ skipping 17 matching lines @@
           // Looking for a getter but found a regular method: closurize it.
           const Function& closure_function =
               Function::Handle(getter.ImplicitClosureFunction());
           return closure_function.ImplicitStaticClosure();
         }
       }
       if (throw_nsm_if_absent) {
         ThrowNoSuchMethod(AbstractType::Handle(klass.RareType()),
                           getter_name,
                           getter,
+                          Array::Handle(),

[siva, 2014/06/12 16:59:07]

Ditto.

                           InvocationMirror::kStatic,
                           InvocationMirror::kGetter);
         UNREACHABLE();
       }
       // Fall through case: Indicate that we didn't find any function or field
       // using a special null instance. This is different from a field being
       // null. Callers make sure that this null does not leak into Dartland.
       return Object::sentinel().raw();
     }
 
@@ skipping 709 matching lines @@
       Array::Handle(ArgumentsDescriptor::New(args.Length(), arg_names));
 
   ArgumentsDescriptor args_descriptor(args_descriptor_array);
 
   if (function.IsNull() ||
       !function.AreValidArguments(args_descriptor, NULL) ||
       !function.is_visible()) {
     ThrowNoSuchMethod(AbstractType::Handle(klass.RareType()),
                       function_name,
                       function,
+                      Array::Handle(),

[siva, 2014/06/12 16:59:07]

Ditto here and other places below.

                       InvocationMirror::kStatic,
                       InvocationMirror::kMethod);
     UNREACHABLE();
   }
 
   Object& result = Object::Handle(
       DartEntry::InvokeFunction(function, args, args_descriptor_array));
   if (result.IsError()) {
     ThrowInvokeError(Error::Cast(result));
     UNREACHABLE();
@@ skipping 18 matching lines @@
   // 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));
   const Class& klass = Class::Handle(ref.GetClassReferent());
   GET_NON_NULL_NATIVE_ARGUMENT(String, setter_name, arguments->NativeArgAt(2));
   GET_NATIVE_ARGUMENT(Instance, value, arguments->NativeArgAt(3));
 
   // Check for real fields and user-defined setters.
   const Field& field = Field::Handle(klass.LookupStaticField(setter_name));
   Function& setter = Function::Handle();
-  if (field.IsNull()) {
-    const String& internal_setter_name = String::Handle(
+  const String& internal_setter_name = String::Handle(
       Field::SetterName(setter_name));
 
+  if (field.IsNull()) {
     setter = klass.LookupStaticFunction(internal_setter_name);
 
+    const int kNumArgs = 1;
+    const Array& args = Array::Handle(Array::New(kNumArgs));
+    args.SetAt(0, value);
+
     if (setter.IsNull() || !setter.is_visible()) {
       ThrowNoSuchMethod(AbstractType::Handle(klass.RareType()),
-                        setter_name,
+                        internal_setter_name,
                         setter,
+                        args,
                         InvocationMirror::kStatic,
                         InvocationMirror::kSetter);
       UNREACHABLE();
     }
 
     // Invoke the setter and return the result.
-    const int kNumArgs = 1;
-    const Array& args = Array::Handle(Array::New(kNumArgs));
-    args.SetAt(0, value);
-
     Object& result = Object::Handle(
         DartEntry::InvokeFunction(setter, args));
     if (result.IsError()) {
       ThrowInvokeError(Error::Cast(result));
       UNREACHABLE();
     }
     return result.raw();
   }
 
   if (field.is_final()) {
     ThrowNoSuchMethod(AbstractType::Handle(klass.RareType()),
-                      setter_name,
+                      internal_setter_name,
                       setter,
+                      Array::Handle(),
                       InvocationMirror::kStatic,
                       InvocationMirror::kSetter);
     UNREACHABLE();
   }
 
   field.set_value(value);
   return value.raw();
 }
 
 
@@ skipping 23 matching lines @@
 
   if (lookup_constructor.IsNull() ||
       !(lookup_constructor.IsConstructor() || lookup_constructor.IsFactory()) ||
       !lookup_constructor.is_visible()) {
     // Pretend we didn't find the constructor at all when the arity is wrong
     // so as to produce the same NoSuchMethodError as the non-reflective case.
     lookup_constructor = Function::null();
     ThrowNoSuchMethod(AbstractType::Handle(klass.RareType()),
                       internal_constructor_name,
                       lookup_constructor,
+                      Array::Handle(),
                       InvocationMirror::kConstructor,
                       InvocationMirror::kMethod);
     UNREACHABLE();
   }
 
   if (klass.is_abstract() && !lookup_constructor.IsFactory()) {
     const Array& error_args = Array::Handle(Array::New(3));
     error_args.SetAt(0, klass_name);
     // 1 = script url
     // 2 = token position
@@ skipping 57 matching lines @@
 
   ArgumentsDescriptor args_descriptor(args_descriptor_array);
   if (!redirected_constructor.AreValidArguments(args_descriptor, NULL) ||
       !redirected_constructor.is_visible()) {
     // Pretend we didn't find the constructor at all when the arity is wrong
     // so as to produce the same NoSuchMethodError as the non-reflective case.
     redirected_constructor = Function::null();
     ThrowNoSuchMethod(AbstractType::Handle(klass.RareType()),
                       internal_constructor_name,
                       redirected_constructor,
+                      Array::Handle(),
                       InvocationMirror::kConstructor,
                       InvocationMirror::kMethod);
     UNREACHABLE();
   }
 
   Instance& new_object = Instance::Handle();
   if (redirected_constructor.IsConstructor()) {
     // Constructors get the uninitialized object and a constructor phase. Note
     // we have delayed allocation until after the function type and argument
     // matching checks.
@@ skipping 42 matching lines @@
       String, function_name, arguments->NativeArgAt(2));
   GET_NON_NULL_NATIVE_ARGUMENT(Array, args, arguments->NativeArgAt(3));
   GET_NON_NULL_NATIVE_ARGUMENT(Array, arg_names, arguments->NativeArgAt(4));
 
   Function& function = Function::Handle(
       library.LookupLocalFunction(function_name));
 
   if (function.IsNull()) {
     // Didn't find a method: try to find a getter and invoke call on its result.
     const Instance& getter_result =
-        Instance::Handle(InvokeLibraryGetter(library, function_name, true));
+        Instance::Handle(InvokeLibraryGetter(library, function_name, false));
+    if (getter_result.raw() != Object::sentinel().raw()) {
     // Make room for the closure (receiver) in arguments.
     intptr_t numArgs = args.Length();
     const Array& call_args = Array::Handle(Array::New(numArgs + 1));
     Object& temp = Object::Handle();
     for (int i = 0; i < numArgs; i++) {
       temp = args.At(i);
       call_args.SetAt(i + 1, temp);
     }
     call_args.SetAt(0, getter_result);
     const Array& call_args_descriptor_array =
       Array::Handle(ArgumentsDescriptor::New(call_args.Length(), arg_names));
     // Call closure.
     const Object& call_result = Object::Handle(
         DartEntry::InvokeClosure(call_args, call_args_descriptor_array));
     if (call_result.IsError()) {
       ThrowInvokeError(Error::Cast(call_result));
       UNREACHABLE();
     }
     return call_result.raw();

[siva, 2014/06/12 16:59:07]

Indentation of this block seems off.

[rmacnak, 2014/06/12 22:52:08]

Fixed.

+    }
   }
 
   const Array& args_descriptor_array =
       Array::Handle(ArgumentsDescriptor::New(args.Length(), arg_names));
   ArgumentsDescriptor args_descriptor(args_descriptor_array);
 
   if (function.IsNull() ||
       !function.AreValidArguments(args_descriptor, NULL) ||
       !function.is_visible()) {
     ThrowNoSuchMethod(Instance::null_instance(),
                       function_name,
                       function,
+                      Array::Handle(),
                       InvocationMirror::kTopLevel,
                       InvocationMirror::kMethod);
     UNREACHABLE();
   }
 
   const Object& result = Object::Handle(
       DartEntry::InvokeFunction(function, args, args_descriptor_array));
   if (result.IsError()) {
     ThrowInvokeError(Error::Cast(result));
     UNREACHABLE();
@@ skipping 21 matching lines @@
   const Library& library = Library::Handle(ref.GetLibraryReferent());
   GET_NON_NULL_NATIVE_ARGUMENT(String, setter_name, arguments->NativeArgAt(2));
   GET_NATIVE_ARGUMENT(Instance, value, arguments->NativeArgAt(3));
 
   // To access a top-level we may need to use the Field or the
   // setter Function.  The setter function may either be in the
   // library or in the field's owner class, depending.
   const Field& field = Field::Handle(
       library.LookupLocalField(setter_name));
   Function& setter = Function::Handle();
+  const String& internal_setter_name =
+      String::Handle(Field::SetterName(setter_name));
 
   if (field.IsNull()) {
-    const String& internal_setter_name =
-        String::Handle(Field::SetterName(setter_name));
+    setter = library.LookupLocalFunction(internal_setter_name);
 
-    setter = library.LookupLocalFunction(internal_setter_name);
+    const int kNumArgs = 1;
+    const Array& args = Array::Handle(Array::New(kNumArgs));
+    args.SetAt(0, value);
+
     if (setter.IsNull() || !setter.is_visible()) {
       ThrowNoSuchMethod(Instance::null_instance(),
-                        setter_name,
+                        internal_setter_name,
                         setter,
+                        args,
                         InvocationMirror::kTopLevel,
                         InvocationMirror::kSetter);
       UNREACHABLE();
     }
 
     // Invoke the setter and return the result.
-    const int kNumArgs = 1;
-    const Array& args = Array::Handle(Array::New(kNumArgs));
-    args.SetAt(0, value);
     const Object& result = Object::Handle(
         DartEntry::InvokeFunction(setter, args));
     if (result.IsError()) {
       ThrowInvokeError(Error::Cast(result));
       UNREACHABLE();
     }
     return result.raw();
   }
 
   if (field.is_final()) {
     ThrowNoSuchMethod(Instance::null_instance(),
-                      setter_name,
+                      internal_setter_name,
                       setter,
+                      Array::Handle(),
                       InvocationMirror::kTopLevel,
                       InvocationMirror::kSetter);
     UNREACHABLE();
   }
 
   field.set_value(value);
   return value.raw();
 }
 
 
@@ skipping 152 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