Fix for issue 10395, call noSUchMethod if a method is not found when using the Dart C API.

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 "platform/assert.h"
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
@@ skipping 3787 matching lines @@
       } else {
         return Api::NewError(
             "%s expects arguments[%d] to be an Instance handle.",
             CURRENT_FUNC, i);
       }
     }
     args.SetAt((i + num_receiver), arg);
   }
 
   if (obj.IsNull() || obj.IsInstance()) {
-    Instance& instance = Instance::Handle(isolate);

[Ivan Posva, 2013/05/07 09:58:43]

Any particular reason for dropping the isolate parameter?

[siva, 2013/05/07 15:40:52]

No particular reason.

I initially tries to change this to Instance::Cast(obj)

but this was causing issues when obj was Null and so turned it back to Handle
but forgot the isolate parameter.
(Need to check why Cast fails on Null).

On 2013/05/07 09:58:43, Ivan Posva wrote:

+    Instance& instance = Instance::Handle();
     instance ^= obj.raw();
     const Function& function = Function::Handle(
         isolate,
         Resolver::ResolveDynamic(instance,
                                  function_name,
                                  (number_of_arguments + 1),
                                  Resolver::kIsQualified));
-    // TODO(5415268): Invoke noSuchMethod instead of failing.
+    args.SetAt(0, instance);
     if (function.IsNull()) {
-      const Type& type = Type::Handle(isolate, instance.GetType());
-      const String& cls_name = String::Handle(isolate, type.ClassName());
-      return Api::NewError("%s: did not find instance method '%s.%s'.",
-                           CURRENT_FUNC,
-                           cls_name.ToCString(),
-                           function_name.ToCString());
+      const Array& args_descriptor =
+          Array::Handle(ArgumentsDescriptor::New(args.Length()));
+      return Api::NewHandle(isolate,
+                            DartEntry::InvokeNoSuchMethod(instance,
+                                                          function_name,
+                                                          args,
+                                                          args_descriptor));
     }
-    args.SetAt(0, instance);
     return Api::NewHandle(isolate, DartEntry::InvokeFunction(function, args));
 
   } else if (obj.IsClass()) {
     // Finalize all classes.
     Dart_Handle state = Api::CheckIsolateState(isolate);
     if (::Dart_IsError(state)) {
       return state;
     }
 
     const Class& cls = Class::Cast(obj);
@@ skipping 90 matching lines @@
   Function& getter = Function::Handle(isolate);
   if (obj.IsNull()) {
     return Api::NewError("%s expects argument 'container' to be non-null.",
                          CURRENT_FUNC);
   } else if (obj.IsInstance()) {
     // Every instance field has a getter Function.  Try to find the
     // getter in any superclass and use that function to access the
     // field.
     const Instance& instance = Instance::Cast(obj);
     Class& cls = Class::Handle(isolate, instance.clazz());
+    String& getter_name =
+        String::Handle(isolate, Field::GetterName(field_name));
     while (!cls.IsNull()) {
-      String& getter_name =
-          String::Handle(isolate, Field::GetterName(field_name));
       getter = cls.LookupDynamicFunctionAllowPrivate(getter_name);
       if (!getter.IsNull()) {
         break;
       }
       cls = cls.SuperClass();
     }
 
-    if (getter.IsNull()) {
-      return Api::NewError("%s: did not find instance field '%s'.",
-                           CURRENT_FUNC, field_name.ToCString());
-    }
-
     // Invoke the getter and return the result.
     const int kNumArgs = 1;
     const Array& args = Array::Handle(isolate, Array::New(kNumArgs));
     args.SetAt(0, instance);
+    if (getter.IsNull()) {
+      const Array& args_descriptor =
+          Array::Handle(ArgumentsDescriptor::New(args.Length()));
+      return Api::NewHandle(isolate,
+                            DartEntry::InvokeNoSuchMethod(instance,
+                                                          getter_name,
+                                                          args,
+                                                          args_descriptor));
+    }
     return Api::NewHandle(isolate, DartEntry::InvokeFunction(getter, args));
 
   } else if (obj.IsClass()) {
     // Finalize all classes.
     Dart_Handle state = Api::CheckIsolateState(isolate);
     if (::Dart_IsError(state)) {
       return state;
     }
     // To access a static field we may need to use the Field or the
     // getter Function.
@@ skipping 83 matching lines @@
   const Object& obj = Object::Handle(isolate, Api::UnwrapHandle(container));
   if (obj.IsNull()) {
     return Api::NewError("%s expects argument 'container' to be non-null.",
                          CURRENT_FUNC);
   } else if (obj.IsInstance()) {
     // Every instance field has a setter Function.  Try to find the
     // setter in any superclass and use that function to access the
     // field.
     const Instance& instance = Instance::Cast(obj);
     Class& cls = Class::Handle(isolate, instance.clazz());
+    String& setter_name =
+        String::Handle(isolate, Field::SetterName(field_name));
     while (!cls.IsNull()) {
       field = cls.LookupInstanceField(field_name);
       if (!field.IsNull() && field.is_final()) {
         return Api::NewError("%s: cannot set final field '%s'.",
                              CURRENT_FUNC, field_name.ToCString());
       }
-      String& setter_name =
-          String::Handle(isolate, Field::SetterName(field_name));
       setter = cls.LookupDynamicFunctionAllowPrivate(setter_name);
       if (!setter.IsNull()) {
         break;
       }
       cls = cls.SuperClass();
     }
 
-    if (setter.IsNull()) {
-      return Api::NewError("%s: did not find instance field '%s'.",
-                           CURRENT_FUNC, field_name.ToCString());
-    }
-
     // Invoke the setter and return the result.
     const int kNumArgs = 2;
     const Array& args = Array::Handle(isolate, Array::New(kNumArgs));
     args.SetAt(0, instance);
     args.SetAt(1, value_instance);
+    if (setter.IsNull()) {
+      const Array& args_descriptor =
+          Array::Handle(ArgumentsDescriptor::New(args.Length()));
+      return Api::NewHandle(isolate,
+                            DartEntry::InvokeNoSuchMethod(instance,
+                                                          setter_name,
+                                                          args,
+                                                          args_descriptor));
+    }
     return Api::NewHandle(isolate, DartEntry::InvokeFunction(setter, args));
 
   } else if (obj.IsClass()) {
     // To access a static field we may need to use the Field or the
     // setter Function.
     const Class& cls = Class::Cast(obj);
     field = cls.LookupStaticField(field_name);
     if (field.IsNull()) {
       String& setter_name =
           String::Handle(isolate, Field::SetterName(field_name));
@@ skipping 755 matching lines @@
   }
   {
     NoGCScope no_gc;
     RawObject* raw_obj = obj.raw();
     isolate->heap()->SetPeer(raw_obj, peer);
   }
   return Api::Success(isolate);
 }
 
 }  // namespace dart