[parser] partially revert "use-strict directives in function body affect init block"

src/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_PREPARSE_DATA_H_
 #define V8_PREPARSE_DATA_H_
 
 #include "src/allocation.h"
 #include "src/hashmap.h"
 #include "src/messages.h"
@@ skipping 36 matching lines @@
 
 // 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,
                            LanguageMode language_mode, bool uses_super_property,
-                           bool calls_eval) = 0;
+                           bool calls_eval, bool has_simple_parameters) = 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) {}
   virtual ~SingletonLogger() {}
 
   void Reset() { has_error_ = false; }
 
   virtual void LogFunction(int start, int end, int literals, int properties,
                            LanguageMode language_mode, bool uses_super_property,
-                           bool calls_eval) {
+                           bool calls_eval, bool has_simple_parameters) {
     DCHECK(!has_error_);
     start_ = start;
     end_ = end;
     literals_ = literals;
     properties_ = properties;
     language_mode_ = language_mode;
     uses_super_property_ = uses_super_property;
     calls_eval_ = calls_eval;
+    has_simple_parameters_ = has_simple_parameters;
   }
 
   // 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;
@@ skipping 20 matching lines @@
     return language_mode_;
   }
   bool uses_super_property() const {
     DCHECK(!has_error_);
     return uses_super_property_;
   }
   bool calls_eval() const {
     DCHECK(!has_error_);
     return calls_eval_;
   }
+  bool has_simple_parameters() const {
+    DCHECK(!has_error_);
+    return has_simple_parameters_;
+  }
   ParseErrorType error_type() const {
     DCHECK(has_error_);
     return error_type_;
   }
   MessageTemplate::Template message() {
     DCHECK(has_error_);
     return message_;
   }
   const char* argument_opt() const {
     DCHECK(has_error_);
     return argument_opt_;
   }
 
  private:
   bool has_error_;
   int start_;
   int end_;
   // For function entries.
   int literals_;
   int properties_;
   LanguageMode language_mode_;
   bool uses_super_property_;
   bool calls_eval_;
+  bool has_simple_parameters_;
   // 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,
                            LanguageMode language_mode, bool uses_super_property,
-                           bool calls_eval) {
+                           bool calls_eval, bool has_simple_parameters) {
     function_store_.Add(start);
     function_store_.Add(end);
     function_store_.Add(literals);
     function_store_.Add(properties);
     function_store_.Add(language_mode);
     function_store_.Add(uses_super_property);
     function_store_.Add(calls_eval);
+    function_store_.Add(has_simple_parameters);
   }
 
   // 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);
   ScriptData* GetScriptData();
 
   bool HasError() {
@@ skipping 12 matching lines @@
 
 #ifdef DEBUG
   int prev_start_;
 #endif
 };
 
 
 } }  // namespace v8::internal.
 
 #endif  // V8_PREPARSE_DATA_H_