Fix Function::NumberOfImplicitParameters() for closure functions.

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/bigint_operations.h"
@@ skipping 3775 matching lines @@
 intptr_t Function::NumberOfImplicitParameters() const {
   if (kind() == RawFunction::kConstructor) {
     if (is_static()) {
       ASSERT(IsFactory());
       return 1;  // Type arguments.
     } else {
       ASSERT(IsConstructor());
       return 2;  // Instance, phase.
     }
   }
+  if (kind() == RawFunction::kClosureFunction) {
+    return 0;
+  }
   if (!is_static()) {

[Ivan Posva, 2012/07/26 18:30:55]

How about

if (!is_static() && (kind() != RawFunction::kClosureFunction) {

then you return 0 below with the correct comment: "No implicit parameters."

The way it is written now is kind of magic. At least adding a comment in the
added code would help understanding.

[regis, 2012/07/26 18:43:19]

Done.

     return 1;  // Receiver.
   }
   return 0;  // No implicit parameters.
 }
 
 
 bool Function::AreValidArgumentCounts(int num_arguments,
                                       int num_named_arguments,
                                       String* error_message) const {
   if (num_arguments > NumberOfParameters()) {
@@ skipping 6977 matching lines @@
   const String& str = String::Handle(pattern());
   const char* format = "JSRegExp: pattern=%s flags=%s";
   intptr_t len = OS::SNPrint(NULL, 0, format, str.ToCString(), Flags());
   char* chars = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len + 1));
   OS::SNPrint(chars, (len + 1), format, str.ToCString(), Flags());
   return chars;
 }
 
 }  // namespace dart