Change resolving of instance methods to check early for name mismatch.

runtime/vm/dart_api_impl.cc

 // Copyright (c) 2013, 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_mirrors_api.h"
 #include "include/dart_native_api.h"
 
 #include "platform/assert.h"
 #include "vm/bigint_operations.h"
@@ skipping 1856 matching lines @@
   }
   CHECK_CALLBACK_STATE(isolate);
 
   // Now check and handle a dart object that implements the List interface.
   const Instance& instance =
       Instance::Handle(isolate, GetListInstance(isolate, obj));
   if (instance.IsNull()) {
     return Api::NewError("Object does not implement the List interface");
   }
   const String& name = String::Handle(Field::GetterName(Symbols::Length()));
+  const int kNumArgs = 1;
+  ArgumentsDescriptor args_desc(
+      Array::Handle(ArgumentsDescriptor::New(kNumArgs)));
   const Function& function =
-      Function::Handle(isolate, Resolver::ResolveDynamic(instance, name, 1, 0));
+      Function::Handle(isolate, Resolver::ResolveDynamic(instance,
+                                                         name,
+                                                         args_desc));
   if (function.IsNull()) {
     return Api::NewError("List object does not have a 'length' field.");
   }
 
-  const int kNumArgs = 1;
   const Array& args = Array::Handle(isolate, Array::New(kNumArgs));
   args.SetAt(0, instance);  // Set up the receiver as the first argument.
   const Object& retval =
     Object::Handle(isolate, DartEntry::InvokeFunction(function, args));
   if (retval.IsSmi()) {
     *len = Smi::Cast(retval).Value();
     return Api::Success();
   } else if (retval.IsMint() || retval.IsBigint()) {
     if (retval.IsMint()) {
       int64_t mint_value = Mint::Cast(retval).value();
@@ skipping 39 matching lines @@
     GET_LIST_ELEMENT(isolate, GrowableObjectArray, obj, index);
   } else if (obj.IsError()) {
     return list;
   } else {
     CHECK_CALLBACK_STATE(isolate);
 
     // Check and handle a dart object that implements the List interface.
     const Instance& instance =
         Instance::Handle(isolate, GetListInstance(isolate, obj));
     if (!instance.IsNull()) {
+      const int kNumArgs = 2;
+      ArgumentsDescriptor args_desc(
+          Array::Handle(ArgumentsDescriptor::New(kNumArgs)));
       const Function& function = Function::Handle(
           isolate,
-          Resolver::ResolveDynamic(instance, Symbols::IndexToken(), 2, 0));
+          Resolver::ResolveDynamic(instance, Symbols::IndexToken(), args_desc));
       if (!function.IsNull()) {
-        const int kNumArgs = 2;
         const Array& args = Array::Handle(isolate, Array::New(kNumArgs));
         const Integer& indexobj = Integer::Handle(isolate, Integer::New(index));
         args.SetAt(0, instance);
         args.SetAt(1, indexobj);
         return Api::NewHandle(isolate, DartEntry::InvokeFunction(function,
                                                                  args));
       }
     }
     return Api::NewError("Object does not implement the 'List' interface");
   }
@@ skipping 27 matching lines @@
     SET_LIST_ELEMENT(isolate, GrowableObjectArray, obj, index, value);
   } else if (obj.IsError()) {
     return list;
   } else {
     CHECK_CALLBACK_STATE(isolate);
 
     // Check and handle a dart object that implements the List interface.
     const Instance& instance =
         Instance::Handle(isolate, GetListInstance(isolate, obj));
     if (!instance.IsNull()) {
+      const intptr_t kNumArgs = 3;
+      ArgumentsDescriptor args_desc(
+          Array::Handle(ArgumentsDescriptor::New(kNumArgs)));
       const Function& function = Function::Handle(
           isolate,
           Resolver::ResolveDynamic(instance,
                                    Symbols::AssignIndexToken(),
-                                   3,
-                                   0));
+                                   args_desc));
       if (!function.IsNull()) {
         const Integer& index_obj =
             Integer::Handle(isolate, Integer::New(index));
         const Object& value_obj =
             Object::Handle(isolate, Api::UnwrapHandle(value));
         if (!value_obj.IsNull() && !value_obj.IsInstance()) {
           RETURN_TYPE_ERROR(isolate, value, Instance);
         }
-        const intptr_t kNumArgs = 3;
         const Array& args = Array::Handle(isolate, Array::New(kNumArgs));
         args.SetAt(0, instance);
         args.SetAt(1, index_obj);
         args.SetAt(2, value_obj);
         return Api::NewHandle(isolate, DartEntry::InvokeFunction(function,
                                                                  args));
       }
     }
     return Api::NewError("Object does not implement the 'List' interface");
   }
@@ skipping 138 matching lines @@
   }
   if (obj.IsError()) {
     return list;
   }
   CHECK_CALLBACK_STATE(isolate);
 
   // Check and handle a dart object that implements the List interface.
   const Instance& instance =
       Instance::Handle(isolate, GetListInstance(isolate, obj));
   if (!instance.IsNull()) {
+    const int kNumArgs = 2;
+    ArgumentsDescriptor args_desc(
+        Array::Handle(ArgumentsDescriptor::New(kNumArgs)));
     const Function& function = Function::Handle(
         isolate,
-        Resolver::ResolveDynamic(instance, Symbols::IndexToken(), 2, 0));
+        Resolver::ResolveDynamic(instance, Symbols::IndexToken(), args_desc));
     if (!function.IsNull()) {
       Object& result = Object::Handle(isolate);
       Integer& intobj = Integer::Handle(isolate);
-      const int kNumArgs = 2;
       const Array& args = Array::Handle(isolate, Array::New(kNumArgs));
       args.SetAt(0, instance);  // Set up the receiver as the first argument.
       for (int i = 0; i < length; i++) {
         intobj = Integer::New(offset + i);
         args.SetAt(1, intobj);
         result = DartEntry::InvokeFunction(function, args);
         if (result.IsError()) {
           return Api::NewHandle(isolate, result.raw());
         }
         if (!result.IsInteger()) {
@@ skipping 68 matching lines @@
   }
   if (obj.IsError()) {
     return list;
   }
   CHECK_CALLBACK_STATE(isolate);
 
   // Check and handle a dart object that implements the List interface.
   const Instance& instance =
       Instance::Handle(isolate, GetListInstance(isolate, obj));
   if (!instance.IsNull()) {
+    const int kNumArgs = 3;
+    ArgumentsDescriptor args_desc(
+        Array::Handle(ArgumentsDescriptor::New(kNumArgs)));
     const Function& function = Function::Handle(
         isolate,
         Resolver::ResolveDynamic(instance,
                                  Symbols::AssignIndexToken(),
-                                 3,
-                                 0));
+                                 args_desc));
     if (!function.IsNull()) {
       Integer& indexobj = Integer::Handle(isolate);
       Integer& valueobj = Integer::Handle(isolate);
-      const int kNumArgs = 3;
       const Array& args = Array::Handle(isolate, Array::New(kNumArgs));
       args.SetAt(0, instance);  // Set up the receiver as the first argument.
       for (int i = 0; i < length; i++) {
         indexobj = Integer::New(offset + i);
         valueobj = Integer::New(native_array[i]);
         args.SetAt(1, indexobj);
         args.SetAt(2, valueobj);
         const Object& result = Object::Handle(
             isolate, DartEntry::InvokeFunction(function, args));
         if (result.IsError()) {
@@ skipping 667 matching lines @@
       return Api::NewError("%s: did not find static method '%s.%s'.",
                            CURRENT_FUNC,
                            cls_name.ToCString(),
                            function_name.ToCString());
     }
     return Api::NewHandle(isolate, DartEntry::InvokeFunction(function, args));
 
   } else if (obj.IsNull() || obj.IsInstance()) {
     Instance& instance = Instance::Handle(isolate);
     instance ^= obj.raw();
+    ArgumentsDescriptor args_desc(
+        Array::Handle(ArgumentsDescriptor::New(number_of_arguments + 1)));
     const Function& function = Function::Handle(
         isolate,
-        Resolver::ResolveDynamic(instance,
-                                 function_name,
-                                 (number_of_arguments + 1),
-                                 Resolver::kIsQualified));
+        Resolver::ResolveDynamic(instance, function_name, args_desc));
     args.SetAt(0, instance);
     if (function.IsNull()) {
       const Array& args_descriptor =
           Array::Handle(ArgumentsDescriptor::New(args.Length()));
       return Api::NewHandle(isolate,
                             DartEntry::InvokeNoSuchMethod(instance,
                                                           function_name,
                                                           args,
                                                           args_descriptor));
     }
@@ skipping 1019 matching lines @@
   }
   {
     NoGCScope no_gc;
     RawObject* raw_obj = obj.raw();
     isolate->heap()->SetPeer(raw_obj, peer);
   }
   return Api::Success();
 }
 
 }  // namespace dart