[cleanup] Remove redundant fields from DeclarationDescriptor

src/parsing/pattern-rewriter.cc

 // Copyright 2015 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/ast/ast.h"
 #include "src/messages.h"
 #include "src/parsing/parameter-initializer-rewriter.h"
 #include "src/parsing/parser.h"
 
 namespace v8 {
@@ skipping 46 matching lines @@
   Variable* var = parser->Declare(declaration, descriptor_->declaration_kind,
                                   descriptor_->mode != VAR, ok_,
                                   descriptor_->hoist_scope);
   if (!*ok_) return;
   DCHECK_NOT_NULL(var);
   DCHECK(!proxy->is_resolved() || proxy->var() == var);
   var->set_initializer_position(initializer_position_);
 
   DCHECK(initializer_position_ != RelocInfo::kNoPosition);
 
-  if (descriptor_->declaration_scope->num_var_or_const() >
-      kMaxNumFunctionLocals) {
+  Scope* declaration_scope = IsLexicalVariableMode(descriptor_->mode)
+                                 ? descriptor_->scope
+                                 : descriptor_->scope->DeclarationScope();
+  if (declaration_scope->num_var_or_const() > kMaxNumFunctionLocals) {
     parser->ReportMessage(MessageTemplate::kTooManyVariables);
     *ok_ = false;
     return;
   }
   if (names_) {
     names_->Add(name, zone());
   }
 
   // Initialize variables if needed. A
   // declaration of the form:
@@ skipping 14 matching lines @@
   //
   //   const c = x;
   //
   // is *not* syntactic sugar for:
   //
   //   const c; c = x;
   //
   // The "variable" c initialized to x is the same as the declared
   // one - there is no re-lookup (see the last parameter of the
   // Declare() call above).
-  Scope* initialization_scope = descriptor_->is_const
-                                    ? descriptor_->declaration_scope
+  Scope* initialization_scope = IsImmutableVariableMode(descriptor_->mode)
+                                    ? declaration_scope
                                     : descriptor_->scope;
 
 
   // Global variable declarations must be compiled in a specific
   // way. When the script containing the global variable declaration
   // is entered, the global variable must be declared, so that if it
   // doesn't exist (on the global object itself, see ES5 errata) it
   // gets created with an initial undefined value. This is handled
   // by the declarations part of the function representing the
   // top-level global code; see Runtime::DeclareGlobalVariable. If
@@ skipping 13 matching lines @@
     // Compute the arguments for the runtime
     // call.test-parsing/InitializedDeclarationsInStrictForOfError
     ZoneList<Expression*>* arguments =
         new (zone()) ZoneList<Expression*>(3, zone());
     // We have at least 1 parameter.
     arguments->Add(
         factory()->NewStringLiteral(name, descriptor_->declaration_pos),
         zone());
     CallRuntime* initialize;
 
-    if (descriptor_->is_const) {
+    if (IsImmutableVariableMode(descriptor_->mode)) {
       arguments->Add(value, zone());
       value = NULL;  // zap the value to avoid the unnecessary assignment
 
       // Construct the call to Runtime_InitializeConstGlobal
       // and add it to the initialization statement block.
       // Note that the function does different things depending on
       // the number of arguments (1 or 2).
       initialize =
           factory()->NewCallRuntime(Runtime::kInitializeConstGlobal, arguments,
                                     descriptor_->initialization_pos);
@@ skipping 277 matching lines @@
 NOT_A_PATTERN(TryFinallyStatement)
 NOT_A_PATTERN(UnaryOperation)
 NOT_A_PATTERN(VariableDeclaration)
 NOT_A_PATTERN(WhileStatement)
 NOT_A_PATTERN(WithStatement)
 NOT_A_PATTERN(Yield)
 
 #undef NOT_A_PATTERN
 }  // namespace internal
 }  // namespace v8