Move module initialization to DeclarationScope

src/ast/scopes.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/ast/scopes.h"
 
 #include <set>
 
 #include "src/accessors.h"
 #include "src/bootstrapper.h"
@@ skipping 94 matching lines @@
       top_unresolved_(scope->unresolved_),
       top_temp_(scope->GetClosureScope()->temps()->length()) {}
 
 DeclarationScope::DeclarationScope(Zone* zone, Scope* outer_scope,
                                    ScopeType scope_type,
                                    FunctionKind function_kind)
     : Scope(zone, outer_scope, scope_type),
       function_kind_(function_kind),
       temps_(4, zone),
       params_(4, zone),
-      sloppy_block_function_map_(zone),
-      module_descriptor_(scope_type == MODULE_SCOPE ? new (zone)
-                                                          ModuleDescriptor(zone)
-                                                    : NULL) {
+      sloppy_block_function_map_(zone) {
   SetDefaults();
+  if (scope_type == MODULE_SCOPE) {
+    module_descriptor_ = new (zone) ModuleDescriptor(zone);
+    language_mode_ = STRICT;
+  }
 }
 
 Scope::Scope(Zone* zone, Scope* inner_scope, ScopeType scope_type,
              Handle<ScopeInfo> scope_info)
     : zone_(zone),
       outer_scope_(nullptr),
       variables_(zone),
       decls_(0, zone),
       scope_info_(scope_info),
       scope_type_(scope_type),
       already_resolved_(true) {
   SetDefaults();
-  if (!scope_info.is_null()) {
+  if (scope_type == WITH_SCOPE) {
+    DCHECK(scope_info.is_null());
+  } else {
     scope_calls_eval_ = scope_info->CallsEval();
     language_mode_ = scope_info->language_mode();
     num_heap_slots_ = scope_info_->ContextLength();

[neis, 2016/08/16 09:21:36]

Can you make these uniform (scope_info_ vs scope_info)?

   }
+
   // Ensure at least MIN_CONTEXT_SLOTS to indicate a materialized context.
   num_heap_slots_ = Max(num_heap_slots_,
                         static_cast<int>(Context::MIN_CONTEXT_SLOTS));
   if (inner_scope != nullptr) AddInnerScope(inner_scope);
 }
 
 DeclarationScope::DeclarationScope(Zone* zone, Scope* inner_scope,
                                    ScopeType scope_type,
                                    Handle<ScopeInfo> scope_info)
     : Scope(zone, inner_scope, scope_type, scope_info),
-      function_kind_(scope_info.is_null() ? kNormalFunction
-                                          : scope_info->function_kind()),
+      function_kind_(scope_info->function_kind()),
       temps_(0, zone),
       params_(0, zone),
-      sloppy_block_function_map_(zone),
-      module_descriptor_(nullptr) {
+      sloppy_block_function_map_(zone) {
   SetDefaults();
 }
 
 Scope::Scope(Zone* zone, Scope* inner_scope,
              const AstRawString* catch_variable_name)
     : zone_(zone),
       outer_scope_(nullptr),
       variables_(zone),
       decls_(0, zone),
       scope_type_(CATCH_SCOPE),
       already_resolved_(true) {
   SetDefaults();
   if (inner_scope != nullptr) AddInnerScope(inner_scope);
   num_heap_slots_ = Context::MIN_CONTEXT_SLOTS;
   Variable* variable =
       variables_.Declare(zone, this, catch_variable_name, VAR, Variable::NORMAL,
                          kCreatedInitialized);
   AllocateHeapSlot(variable);
 }
 
 void DeclarationScope::SetDefaults() {
   is_declaration_scope_ = true;
   has_simple_parameters_ = true;
   receiver_ = nullptr;
   new_target_ = nullptr;
   function_ = nullptr;
   arguments_ = nullptr;
   this_function_ = nullptr;
   arity_ = 0;
-  rest_parameter_ = NULL;
+  rest_parameter_ = nullptr;
   rest_index_ = -1;
+  module_descriptor_ = nullptr;
 }
 
 void Scope::SetDefaults() {
 #ifdef DEBUG
   scope_name_ = nullptr;
 #endif
   inner_scope_ = nullptr;
   sibling_ = nullptr;
   unresolved_ = nullptr;
   dynamics_ = nullptr;
 
   start_position_ = kNoSourcePosition;
   end_position_ = kNoSourcePosition;
 
   num_stack_slots_ = 0;
   num_heap_slots_ = 0;
   num_global_slots_ = 0;
 
-  language_mode_ = is_module_scope() ? STRICT : SLOPPY;
+  language_mode_ = SLOPPY;
 
   scope_inside_with_ = false;
   scope_calls_eval_ = false;
   scope_uses_super_property_ = false;
   has_arguments_parameter_ = false;
   asm_module_ = false;
   asm_function_ = false;
   scope_nonlinear_ = false;
   is_hidden_ = false;
   is_debug_evaluate_scope_ = false;
@@ skipping 16 matching lines @@
                                     DeclarationScope* script_scope,
                                     AstValueFactory* ast_value_factory,
                                     DeserializationMode deserialization_mode) {
   // Reconstruct the outer scope chain from a closure's context chain.
   Scope* current_scope = nullptr;
   Scope* innermost_scope = nullptr;
   while (!context->IsNativeContext()) {
     if (context->IsWithContext() || context->IsDebugEvaluateContext()) {
       // For scope analysis, debug-evaluate is equivalent to a with scope.
       Scope* with_scope = new (zone)
-          Scope(zone, current_scope, WITH_SCOPE, Handle<ScopeInfo>::null());
+          Scope(zone, current_scope, WITH_SCOPE, Handle<ScopeInfo>());
       // TODO(yangguo): Remove once debug-evaluate properly keeps track of the
       // function scope in which we are evaluating.
       if (context->IsDebugEvaluateContext()) {
         with_scope->set_is_debug_evaluate_scope();
       }
       current_scope = with_scope;
       // All the inner scopes are inside a with.
       for (Scope* s = innermost_scope; s != nullptr; s = s->outer_scope()) {
         s->scope_inside_with_ = true;
       }
     } else if (context->IsScriptContext()) {
-      ScopeInfo* scope_info = context->scope_info();
-      current_scope = new (zone) DeclarationScope(
-          zone, current_scope, SCRIPT_SCOPE, Handle<ScopeInfo>(scope_info));
+      Handle<ScopeInfo> scope_info(context->scope_info(), isolate);
+      current_scope = new (zone)
+          DeclarationScope(zone, current_scope, SCRIPT_SCOPE, scope_info);
     } else if (context->IsFunctionContext()) {
-      ScopeInfo* scope_info = context->closure()->shared()->scope_info();
-      current_scope = new (zone) DeclarationScope(
-          zone, current_scope, FUNCTION_SCOPE, Handle<ScopeInfo>(scope_info));
+      Handle<ScopeInfo> scope_info(context->closure()->shared()->scope_info(),
+                                   isolate);
+      current_scope = new (zone)
+          DeclarationScope(zone, current_scope, FUNCTION_SCOPE, scope_info);
       if (scope_info->IsAsmFunction()) current_scope->asm_function_ = true;
       if (scope_info->IsAsmModule()) current_scope->asm_module_ = true;
     } else if (context->IsBlockContext()) {
-      ScopeInfo* scope_info = context->scope_info();
+      Handle<ScopeInfo> scope_info(context->scope_info(), isolate);
       if (scope_info->is_declaration_scope()) {
-        current_scope = new (zone) DeclarationScope(
-            zone, current_scope, BLOCK_SCOPE, Handle<ScopeInfo>(scope_info));
+        current_scope = new (zone)
+            DeclarationScope(zone, current_scope, BLOCK_SCOPE, scope_info);
       } else {
-        current_scope = new (zone) Scope(zone, current_scope, BLOCK_SCOPE,
-                                         Handle<ScopeInfo>(scope_info));
+        current_scope =
+            new (zone) Scope(zone, current_scope, BLOCK_SCOPE, scope_info);
       }
     } else {
       DCHECK(context->IsCatchContext());
       String* name = context->catch_name();
       current_scope =
           new (zone) Scope(zone, current_scope,
                            ast_value_factory->GetString(handle(name, isolate)));
     }
     if (deserialization_mode == DeserializationMode::kDeserializeOffHeap) {
       current_scope->DeserializeScopeInfo(isolate, ast_value_factory);
@@ skipping 1494 matching lines @@
       function != nullptr && function->IsContextSlot();
   return num_heap_slots() - Context::MIN_CONTEXT_SLOTS - num_global_slots() -
          (is_function_var_in_context ? 1 : 0);
 }
 
 
 int Scope::ContextGlobalCount() const { return num_global_slots(); }
 
 }  // namespace internal
 }  // namespace v8