Correct handling of named optional parameters with noSuchMethod invocations.

runtime/vm/object.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 "vm/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 1809 matching lines @@
     dispatcher ^= CreateNoSuchMethodDispatcher(target_name, args_desc);
     cache.SetAt(i + kNameIndex, target_name);
     cache.SetAt(i + kArgsDescIndex, args_desc);
     cache.SetAt(i + kFunctionIndex, dispatcher);
   }
   return dispatcher.raw();
 }
 
 
 RawFunction* Class::CreateNoSuchMethodDispatcher(const String& target_name,
-                                              const Array& args_desc) const {
+                                                 const Array& args_desc) const {
   Function& invocation = Function::Handle(
       Function::New(String::Handle(Symbols::New(target_name)),
                     RawFunction::kNoSuchMethodDispatcher,
                     false,  // Not static.
                     false,  // Not const.
                     false,  // Not abstract.
                     false,  // Not external.
                     *this,
                     0));  // No token position.
   ArgumentsDescriptor desc(args_desc);
-  const intptr_t num_parameters = desc.Count();
-  invocation.set_num_fixed_parameters(num_parameters);
-  invocation.SetNumOptionalParameters(0, true);
-  invocation.set_parameter_types(Array::Handle(Array::New(num_parameters,
+  invocation.set_num_fixed_parameters(desc.PositionalCount());
+  invocation.SetNumOptionalParameters(desc.NamedCount(),
+                                      false);  // Not positional.
+  invocation.set_parameter_types(Array::Handle(Array::New(desc.Count(),
                                                          Heap::kOld)));
-  invocation.set_parameter_names(Array::Handle(Array::New(num_parameters,
+  invocation.set_parameter_names(Array::Handle(Array::New(desc.Count(),
                                                          Heap::kOld)));
   // Receiver.
   invocation.SetParameterTypeAt(0, Type::Handle(Type::DynamicType()));
   invocation.SetParameterNameAt(0, Symbols::This());
-  // Remaining parameters.
-  for (intptr_t i = 1; i < num_parameters; i++) {
+  // Remaining positional parameters.
+  intptr_t i = 1;
+  for (; i < desc.PositionalCount(); i++) {
     invocation.SetParameterTypeAt(i, Type::Handle(Type::DynamicType()));
     char name[64];
     OS::SNPrint(name, 64, ":p%"Pd, i);
     invocation.SetParameterNameAt(i, String::Handle(Symbols::New(name)));
   }
+
+  // Named parameters.
+  for (; i < desc.Count(); i++) {
+    invocation.SetParameterTypeAt(i, Type::Handle(Type::DynamicType()));
+    intptr_t index = i - desc.PositionalCount();
+    invocation.SetParameterNameAt(i, String::Handle(desc.NameAt(index)));
+  }
   invocation.set_result_type(Type::Handle(Type::DynamicType()));
   invocation.set_is_visible(false);  // Not visible in stack trace.
   invocation.set_saved_args_desc(args_desc);
 
   return invocation.raw();
 }
 
 
 RawArray* Class::no_such_method_cache() const {
   return raw_ptr()->no_such_method_cache_;
@@ skipping 12277 matching lines @@
 }
 
 
 void MirrorReference::PrintToJSONStream(JSONStream* stream, bool ref) const {
   stream->OpenObject();
   stream->CloseObject();
 }
 
 
 }  // namespace dart