[es6] Implement proper TDZ for parameters

src/parser.h

 // Copyright 2012 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_PARSER_H_
 #define V8_PARSER_H_
 
 #include "src/allocation.h"
 #include "src/ast.h"
 #include "src/compiler.h"  // TODO(titzer): remove this include dependency
@@ skipping 538 matching lines @@
   };
 
   explicit ParserFormalParameters(Scope* scope)
       : PreParserFormalParameters(scope), params(4, scope->zone()) {}
 
   ZoneList<Parameter> params;
 
   void AddParameter(
       const AstRawString* name, Expression* pattern, bool is_rest) {
     params.Add(Parameter(name, pattern, is_rest), scope->zone());
     DCHECK(arity == params.length());

[adamk, 2015/08/03 18:43:51]

This code could be responsible for keeping arity in sync for the Parser version,
letting the preparser handle the incrementing in AddFormalParameter (see my
comment in preparser.h).

A more robust alternative: make the |arity| member private in the superclass
(arity_), and add an arity() getter which in the PreParser class returns that
private member and in this version returns params.length().

   }
+
+  const Parameter& at(int i) { return params[i]; }
 };
 
 
 class ParserTraits {
  public:
   struct Type {
     // TODO(marja): To be removed. The Traits object should contain all the data
     // it needs.
     typedef v8::internal::Parser* Parser;
 
@@ skipping 204 matching lines @@
     return new(zone) ZoneList<v8::internal::Statement*>(size, zone);
   }
 
   V8_INLINE void AddParameterInitializationBlock(
       const ParserFormalParameters& parameters,
       ZoneList<v8::internal::Statement*>* body, bool* ok);
 
   V8_INLINE Scope* NewScope(Scope* parent_scope, ScopeType scope_type,
                             FunctionKind kind = kNormalFunction);
 
+  V8_INLINE void AddFormalParameter(
+      ParserFormalParameters* parameters, Expression* pattern, bool is_rest);
   V8_INLINE void DeclareFormalParameter(
-      ParserFormalParameters* parameters, Expression* pattern, bool is_rest,
-      ExpressionClassifier* classifier);
+      Scope* scope, const ParserFormalParameters::Parameter& parameter,
+      bool is_simple, ExpressionClassifier* classifier);
   void ParseArrowFunctionFormalParameters(
       ParserFormalParameters* parameters, Expression* params,
       const Scanner::Location& params_loc,
       Scanner::Location* duplicate_loc, bool* ok);
+  void ParseArrowFunctionFormalParameterList(
+      ParserFormalParameters* parameters, Expression* params,
+      const Scanner::Location& params_loc,
+      Scanner::Location* duplicate_loc, bool* ok);
 
   void ReindexLiterals(const ParserFormalParameters& parameters);
 
   // Temporary glue; these functions will move to ParserBase.
   Expression* ParseV8Intrinsic(bool* ok);
   FunctionLiteral* ParseFunctionLiteral(
       const AstRawString* name, Scanner::Location function_name_location,
       FunctionNameValidity function_name_validity, FunctionKind kind,
       int function_token_position, FunctionLiteral::FunctionType type,
       FunctionLiteral::ArityRestriction arity_restriction,
@@ skipping 502 matching lines @@
   return parser_->SpreadCall(function, args, pos);
 }
 
 
 Expression* ParserTraits::SpreadCallNew(
     Expression* function, ZoneList<v8::internal::Expression*>* args, int pos) {
   return parser_->SpreadCallNew(function, args, pos);
 }
 
 
+void ParserTraits::AddFormalParameter(
+    ParserFormalParameters* parameters, Expression* pattern, bool is_rest) {
+  bool is_simple = pattern->IsVariableProxy();
+  DCHECK(parser_->allow_harmony_destructuring() ||
+         parser_->allow_harmony_rest_parameters() || is_simple);
+  const AstRawString* name = is_simple
+                                 ? pattern->AsVariableProxy()->raw_name()
+                                 : parser_->ast_value_factory()->empty_string();
+  parameters->AddParameter(name, pattern, is_rest);
+  DCHECK(parameters->arity == parameters->params.length());

[adamk, 2015/08/03 18:43:52]

Nit: DCHECK_EQ

[rossberg, 2015/08/04 15:31:19]

Done.

+}
+
+
 void ParserTraits::DeclareFormalParameter(
-    ParserFormalParameters* parameters, Expression* pattern, bool is_rest,
-    ExpressionClassifier* classifier) {
+    Scope* scope, const ParserFormalParameters::Parameter& parameter,
+    bool is_simple, ExpressionClassifier* classifier) {
   bool is_duplicate = false;
-  bool is_simple = pattern->IsVariableProxy();
-  DCHECK(parser_->allow_harmony_destructuring() || is_simple);
-
-  const AstRawString* name = is_simple
-                                 ? pattern->AsVariableProxy()->raw_name()
-                                 : parser_->ast_value_factory()->empty_string();
-  Variable* var =
-      parameters->scope->DeclareParameter(name, VAR, is_rest, &is_duplicate);
-  parameters->AddParameter(name, is_simple ? nullptr : pattern, is_rest);
+  Variable* var = scope->DeclareParameter(
+      // TODO(caitp): Remove special handling for rest once desugaring is in.
+      is_simple || parameter.is_rest
+          ? parameter.name : parser_->ast_value_factory()->empty_string(),
+      VAR, parameter.is_rest, &is_duplicate);
   if (is_duplicate) {
     classifier->RecordDuplicateFormalParameterError(
         parser_->scanner()->location());
   }
-  if (is_sloppy(parameters->scope->language_mode())) {
+  if (is_sloppy(scope->language_mode())) {
     // TODO(sigurds) Mark every parameter as maybe assigned. This is a
     // conservative approximation necessary to account for parameters
     // that are assigned via the arguments array.
     var->set_maybe_assigned();
   }
 }
 
 
 void ParserTraits::AddParameterInitializationBlock(
     const ParserFormalParameters& parameters,
     ZoneList<v8::internal::Statement*>* body, bool* ok) {
   if (!parameters.is_simple) {
     auto* init_block =
         parser_->BuildParameterInitializationBlock(parameters, ok);
     if (!*ok) return;
     if (init_block != nullptr) {
       body->Add(init_block, parser_->zone());
     }
   }
 }
 } }  // namespace v8::internal
 
 #endif  // V8_PARSER_H_