Preparse lazy function parameters

src/parsing/preparse-data.h

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_PARSING_PREPARSE_DATA_H_
 #define V8_PARSING_PREPARSE_DATA_H_
 
 #include "src/allocation.h"
 #include "src/base/hashmap.h"
 #include "src/collector.h"
@@ skipping 35 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ScriptData);
 };
 
 // Abstract interface for preparse data recorder.
 class ParserRecorder {
  public:
   ParserRecorder() { }
   virtual ~ParserRecorder() { }
 
   // Logs the scope and some details of a function literal in the source.
-  virtual void LogFunction(int start, int end, int literals, int properties,
+  virtual void LogFunction(int key, int start, int end, int num_parameters,
+                           int function_length, bool has_duplicate_parameters,
+                           int literals, int properties,
                            LanguageMode language_mode, bool uses_super_property,
                            bool calls_eval) = 0;
 
   // Logs an error message and marks the log as containing an error.
   // Further logging will be ignored, and ExtractData will return a vector
   // representing the error only.
   virtual void LogMessage(int start, int end, MessageTemplate::Template message,
                           const char* argument_opt,
                           ParseErrorType error_type) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ParserRecorder);
 };
 
 
 class SingletonLogger : public ParserRecorder {
  public:
   SingletonLogger()
-      : has_error_(false), start_(-1), end_(-1), error_type_(kSyntaxError) {}
+      : has_error_(false),
+        key_(-1),
+        start_(-1),
+        end_(-1),
+        num_parameters_(-1),
+        function_length_(-1),
+        has_duplicate_parameters_(false),
+        error_type_(kSyntaxError) {}
   virtual ~SingletonLogger() {}
 
   void Reset() { has_error_ = false; }
 
-  virtual void LogFunction(int start, int end, int literals, int properties,
+  virtual void LogFunction(int key, int start, int end, int num_parameters,
+                           int function_length, bool has_duplicate_parameters,
+                           int literals, int properties,
                            LanguageMode language_mode, bool uses_super_property,
                            bool calls_eval) {
     DCHECK(!has_error_);
     // Check that we only log at most one function.
     DCHECK(start_ == -1 && end_ == -1);
+    key_ = key;
     start_ = start;
     end_ = end;
+    num_parameters_ = num_parameters;
+    function_length_ = function_length;
+    has_duplicate_parameters_ = has_duplicate_parameters;
     literals_ = literals;
     properties_ = properties;
     language_mode_ = language_mode;
     uses_super_property_ = uses_super_property;
     calls_eval_ = calls_eval;
   }
 
   // Logs an error message and marks the log as containing an error.
   // Further logging will be ignored, and ExtractData will return a vector
   // representing the error only.
   virtual void LogMessage(int start, int end, MessageTemplate::Template message,
                           const char* argument_opt, ParseErrorType error_type) {
     if (has_error_) return;
     has_error_ = true;
     start_ = start;
     end_ = end;
     message_ = message;
     argument_opt_ = argument_opt;
     error_type_ = error_type;
   }
 
   bool has_error() const { return has_error_; }
 
   int start() const { return start_; }
   int end() const { return end_; }
+  int num_parameters() const {
+    DCHECK(!has_error_);
+    return num_parameters_;
+  }
+  int function_length() const {
+    DCHECK(!has_error_);
+    return function_length_;
+  }
+  bool has_duplicate_parameters() const {
+    DCHECK(!has_error_);
+    return has_duplicate_parameters_;
+  }
   int literals() const {
     DCHECK(!has_error_);
     return literals_;
   }
   int properties() const {
     DCHECK(!has_error_);
     return properties_;
   }
   LanguageMode language_mode() const {
     DCHECK(!has_error_);
@@ skipping 15 matching lines @@
     DCHECK(has_error_);
     return message_;
   }
   const char* argument_opt() const {
     DCHECK(has_error_);
     return argument_opt_;
   }
 
  private:
   bool has_error_;
+  int key_;
   int start_;
   int end_;
   // For function entries.
+  int num_parameters_;
+  int function_length_;
+  bool has_duplicate_parameters_;
   int literals_;
   int properties_;
   LanguageMode language_mode_;
   bool uses_super_property_;
   bool calls_eval_;
   // For error messages.
   MessageTemplate::Template message_;
   const char* argument_opt_;
   ParseErrorType error_type_;
 };
 
 
 class CompleteParserRecorder : public ParserRecorder {
  public:
   struct Key {
     bool is_one_byte;
     Vector<const byte> literal_bytes;
   };
 
   CompleteParserRecorder();
   virtual ~CompleteParserRecorder() {}
 
-  virtual void LogFunction(int start, int end, int literals, int properties,
+  virtual void LogFunction(int key, int start, int end, int num_parameters,
+                           int function_length, bool has_duplicate_parameters,
+                           int literals, int properties,
                            LanguageMode language_mode, bool uses_super_property,
                            bool calls_eval) {
+    function_store_.Add(key);
     function_store_.Add(start);
     function_store_.Add(end);
+    function_store_.Add(num_parameters);
+    function_store_.Add(function_length);
+    function_store_.Add(has_duplicate_parameters);
     function_store_.Add(literals);
     function_store_.Add(properties);
     function_store_.Add(language_mode);
     function_store_.Add(uses_super_property);
     function_store_.Add(calls_eval);
   }
 
   // Logs an error message and marks the log as containing an error.
   // Further logging will be ignored, and ExtractData will return a vector
   // representing the error only.
@@ skipping 18 matching lines @@
 #ifdef DEBUG
   int prev_start_;
 #endif
 };
 
 
 }  // namespace internal
 }  // namespace v8.
 
 #endif  // V8_PARSING_PREPARSE_DATA_H_