Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(170)

Unified Diff: runtime/vm/object.h

Issue 10928160: Limit the maximum number of formal parameters (32K fixed and 32K optional) (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/flow_graph_compiler_x64.cc ('k') | runtime/vm/object.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/object.h
===================================================================
--- runtime/vm/object.h (revision 12287)
+++ runtime/vm/object.h (working copy)
@@ -1476,20 +1476,34 @@
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 num_optional_positional_parameters() const {
- return raw_ptr()->num_optional_positional_parameters_;
+ bool HasOptionalPositionalParameters() const {
+ return raw_ptr()->num_optional_parameters_ > 0;
}
- void set_num_optional_positional_parameters(intptr_t value) const;
+ bool HasOptionalNamedParameters() const {
+ 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;
+ }
+ void SetNumOptionalParameters(intptr_t num_optional_parameters,
+ bool are_optional_positional) const;
- intptr_t num_optional_named_parameters() const {
- return raw_ptr()->num_optional_named_parameters_;
+ intptr_t NumOptionalPositionalParameters() const {
+ const intptr_t num_opt_params = raw_ptr()->num_optional_parameters_;
+ return (num_opt_params > 0) ? num_opt_params : 0;
}
- void set_num_optional_named_parameters(intptr_t value) const;
+ 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 NumParameters() const;
+
+ intptr_t NumImplicitParameters() const;
+
static intptr_t usage_counter_offset() {
return OFFSET_OF(RawFunction, usage_counter_);
}
@@ -1523,12 +1537,6 @@
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,
@@ -1680,6 +1688,7 @@
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();
« no previous file with comments | « runtime/vm/flow_graph_compiler_x64.cc ('k') | runtime/vm/object.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698