Limit the maximum number of formal parameters (32K fixed and 32K optional)

runtime/vm/object.h

 // 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.
 
 #ifndef VM_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 1458 matching lines @@
   void set_end_token_pos(intptr_t value) const {
     raw_ptr()->end_token_pos_ = value;
   }
 
   intptr_t num_fixed_parameters() const {
     return raw_ptr()->num_fixed_parameters_;
   }
   void set_num_fixed_parameters(intptr_t value) const;
 
   bool HasOptionalParameters() const {
-    return (num_optional_positional_parameters() +
-            num_optional_named_parameters()) > 0;
+    return raw_ptr()->num_optional_parameters_ != 0;
+  }
+  intptr_t NumOptionalParameters() const {
+    const intptr_t num_opt_params = raw_ptr()->num_optional_parameters_;
+    return (num_opt_params > 0) ? num_opt_params : -num_opt_params;

[siva, 2012/09/12 22:19:50]

Should this be (num_opt_params >= 0) ? num_opt_params: -num_opt_params;

[regis, 2012/09/12 23:33:32]

I think it does not matter. But I agree it is easier to read with >= 0. Changed.

+  }
+  void SetNumOptionalParameters(intptr_t num_optional_positional_parameters,
+                                intptr_t num_optional_named_parameters) const;

[siva, 2012/09/12 22:19:50]

I feel this function would be more readable if the signature
was:
void SetNumOptionalParameters(intptr_t num_optional_params,
                              bool are_position_optional);

That would make the invocation from the parser clearer.

[regis, 2012/09/12 23:33:32]

Done.

+
+  intptr_t NumOptionalPositionalParameters() const {
+    const intptr_t num_opt_params = raw_ptr()->num_optional_parameters_;
+    return (num_opt_params > 0) ? num_opt_params : 0;
+  }
+  intptr_t NumOptionalNamedParameters() const {
+    const intptr_t num_opt_params = raw_ptr()->num_optional_parameters_;
+    return (num_opt_params < 0) ? -num_opt_params : 0;
   }
 
-  intptr_t num_optional_positional_parameters() const {
-    return raw_ptr()->num_optional_positional_parameters_;
-  }
-  void set_num_optional_positional_parameters(intptr_t value) const;
+  intptr_t NumParameters() const;
 
-  intptr_t num_optional_named_parameters() const {
-    return raw_ptr()->num_optional_named_parameters_;
-  }
-  void set_num_optional_named_parameters(intptr_t value) const;
+  intptr_t NumImplicitParameters() const;
 
   static intptr_t usage_counter_offset() {
     return OFFSET_OF(RawFunction, usage_counter_);
   }
   intptr_t usage_counter() const {
     return raw_ptr()->usage_counter_;
   }
   void set_usage_counter(intptr_t value) const {
     raw_ptr()->usage_counter_ = value;
   }
@@ skipping 14 matching lines @@
   void set_has_finally(bool value) const;
 
   bool is_native() const { return NativeBit::decode(raw_ptr()->kind_tag_); }
   void set_is_native(bool value) const;
 
   bool is_abstract() const { return AbstractBit::decode(raw_ptr()->kind_tag_); }
   void set_is_abstract(bool value) const;
 
   bool HasOptimizedCode() const;
 
-  intptr_t NumberOfParameters() const;
-  intptr_t NumberOfImplicitParameters() const;
-  void SetNumberOfParameters(intptr_t num_fixed_parameters,
-                             intptr_t num_optional_parameters,
-                             bool are_optional_positional) const;
-
   // Returns true if the argument counts are valid for calling this function.
   // Otherwise, it returns false and the reason (if error_message is not NULL).
   bool AreValidArgumentCounts(int num_arguments,
                               int num_named_arguments,
                               String* error_message) const;
 
   // Returns true if the total argument count and the names of optional
   // arguments are valid for calling this function.
   // Otherwise, it returns false and the reason (if error_message is not NULL).
   bool AreValidArguments(int num_arguments,
@@ skipping 131 matching lines @@
 
   void set_name(const String& value) const;
   void set_kind(RawFunction::Kind value) const;
   void set_is_static(bool value) const;
   void set_is_const(bool value) const;
   void set_is_external(bool value) const;
   void set_parent_function(const Function& value) const;
   void set_owner(const Object& value) const;
   void set_token_pos(intptr_t value) const;
   void set_implicit_closure_function(const Function& value) const;
+  void set_num_optional_parameters(intptr_t value) const;  // Encoded value.
   void set_kind_tag(intptr_t value) const;
   static RawFunction* New();
 
   RawString* BuildSignature(bool instantiate,
                             NameVisibility name_visibility,
                             const AbstractTypeArguments& instantiator) const;
 
   // Check the subtype or 'more specific' relationship.
   bool TypeTest(TypeTestKind test_kind,
                 const AbstractTypeArguments& type_arguments,
@@ skipping 3882 matching lines @@
     if (this->CharAt(i) != str.CharAt(begin_index + i)) {
       return false;
     }
   }
   return true;
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_