[es6] Check declaration conflicts between non-simple parameters and the function body

src/parser.cc

 // 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.
 
 #include "src/v8.h"
 
 #include "src/api.h"
 #include "src/ast.h"
 #include "src/ast-literal-reindexer.h"
 #include "src/bailout-reason.h"
@@ skipping 4414 matching lines @@
     }
   }
 
   Expect(Token::RBRACE, CHECK_OK);
   scope_->set_end_position(scanner()->location().end_pos);
   if (inner_scope != nullptr) {
     DCHECK(inner_block != nullptr);
     inner_scope->set_end_position(scanner()->location().end_pos);
     inner_scope = inner_scope->FinalizeBlockScope();
     inner_block->set_scope(inner_scope);
+    if (inner_scope) CheckConflictingVarDeclarations(inner_scope, CHECK_OK);

[adamk, 2015/07/15 21:12:30]

CHECK_OK shouldn't be used in a single-statement if like this (even if it would
turn out to do the right thing). Better to add a block here.

You could also guard the above inner_block->set_scope() call with this check
while you're at it. (and nit: change the condition to inner_scope != nullptr to
match surrounding code)

[rossberg, 2015/07/16 14:26:40]

Done.

   }
 
   return result;
 }
 
 
 PreParser::PreParseResult Parser::ParseLazyFunctionBodyWithPreParser(
     SingletonLogger* logger, Scanner::BookmarkScope* bookmark) {
   // This function may be called on a background thread too; record only the
   // main thread preparse times.
@@ skipping 1532 matching lines @@
 Expression* Parser::SpreadCallNew(Expression* function,
                                   ZoneList<v8::internal::Expression*>* args,
                                   int pos) {
   args->InsertAt(0, function, zone());
 
   return factory()->NewCallRuntime(
       ast_value_factory()->reflect_construct_string(), NULL, args, pos);
 }
 }  // namespace internal
 }  // namespace v8