Revert of Separate Scope into DeclarationScope and Scope

Revert of Separate Scope into DeclarationScope and Scope (patchset #13 id:240001 of https://codereview.chromium.org/2209573002/ )

Reason for revert:
[Sheriff] Make leak checker unhappy:
https://build.chromium.org/p/client.v8/builders/V8%20Linux64%20-%20debug/builds/10959

Original issue's description:
> Separate Scope into DeclarationScope and Scope
>
> This reduces peak zone memory usage by ~10% on codeload and ~5% on mandreel.
>
> BUG=v8:5209
>
> Committed: https://crrev.com/2648162dcfff622f8587cea2faa8c3af56456968
> Cr-Commit-Position: refs/heads/master@{#38367}

TBR=marja@chromium.org,mstarzinger@chromium.org,ahaas@chromium.org,adamk@chromium.org,verwaest@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=v8:5209
Committed: https://crrev.com/2b6675c35051c522570f07e52349fd185bea7176
Cr-Commit-Position: refs/heads/master@{#38380}

[Michael Achenbach, 2016-08-05 12:05:40]

The CQ bit was checked by machenbach@chromium.org

[Michael Achenbach, 2016-08-05 12:05:40]

Created Revert of Separate Scope into DeclarationScope and Scope

[commit-bot: I haz the power, 2016-08-05 12:05:47]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-05 12:06:05]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-08-05 12:06:07]

Failed to apply patch for src/ast/scopes.cc:
While running git apply --index -3 -p1;
  error: patch failed: src/ast/scopes.cc:344
  Falling back to three-way merge...
  Applied patch to 'src/ast/scopes.cc' with conflicts.
  U src/ast/scopes.cc

Patch:       src/ast/scopes.cc
Index: src/ast/scopes.cc
diff --git a/src/ast/scopes.cc b/src/ast/scopes.cc
index
f272931b9258a01afe4573718db2861c322fc828..35507c36fb4221b838b52227201e48514d875c73
100644
--- a/src/ast/scopes.cc
+++ b/src/ast/scopes.cc
@@ -83,11 +83,19 @@
 // ----------------------------------------------------------------------------
 // Implementation of Scope
 
-Scope::Scope(Zone* zone, Scope* outer_scope, ScopeType scope_type)
+Scope::Scope(Zone* zone, Scope* outer_scope, ScopeType scope_type,
+             FunctionKind function_kind)
     : outer_scope_(outer_scope),
       variables_(zone),
+      temps_(4, zone),
+      params_(4, zone),
       decls_(4, zone),
+      module_descriptor_(scope_type == MODULE_SCOPE ? new (zone)
+                                                         
ModuleDescriptor(zone)
+                                                    : NULL),
+      sloppy_block_function_map_(zone),
       scope_type_(scope_type),
+      function_kind_(function_kind),
       already_resolved_(false) {
   SetDefaults();
   if (outer_scope == nullptr) {
@@ -106,38 +114,25 @@
   }
 }
 
-Scope::Snapshot::Snapshot(Scope* scope)
-    : outer_scope_(scope),
-      top_inner_scope_(scope->inner_scope_),
-      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) {
-  SetDefaults();
-}
-
 Scope::Scope(Zone* zone, Scope* inner_scope, ScopeType scope_type,
              Handle<ScopeInfo> scope_info)
     : outer_scope_(nullptr),
       variables_(zone),
+      temps_(4, zone),
+      params_(4, zone),
       decls_(4, zone),
-      scope_info_(scope_info),
+      module_descriptor_(nullptr),
+      sloppy_block_function_map_(zone),
       scope_type_(scope_type),
-      already_resolved_(true) {
+      function_kind_(scope_info.is_null() ? kNormalFunction
+                                          : scope_info->function_kind()),
+      already_resolved_(true),
+      scope_info_(scope_info) {
   SetDefaults();
   if (!scope_info.is_null()) {
     scope_calls_eval_ = scope_info->CallsEval();
     language_mode_ = scope_info->language_mode();
+    is_declaration_scope_ = scope_info->is_declaration_scope();
     num_heap_slots_ = scope_info_->ContextLength();
   }
   // Ensure at least MIN_CONTEXT_SLOTS to indicate a materialized context.
@@ -146,25 +141,17 @@
   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()),
-      temps_(4, zone),
-      params_(4, zone),
-      sloppy_block_function_map_(zone),
-      module_descriptor_(nullptr) {
-  SetDefaults();
-}
-
 Scope::Scope(Zone* zone, Scope* inner_scope,
              const AstRawString* catch_variable_name)
     : outer_scope_(nullptr),
       variables_(zone),
+      temps_(0, zone),
+      params_(0, zone),
       decls_(0, zone),
+      module_descriptor_(nullptr),
+      sloppy_block_function_map_(zone),
       scope_type_(CATCH_SCOPE),
+      function_kind_(kNormalFunction),
       already_resolved_(true) {
   SetDefaults();
   AddInnerScope(inner_scope);
@@ -177,28 +164,22 @@
   AllocateHeapSlot(variable);
 }
 
-void DeclarationScope::SetDefaults() {
-  is_declaration_scope_ = true;
+void Scope::SetDefaults() {
+  is_declaration_scope_ =
+      is_eval_scope() || is_function_scope() ||
+      is_module_scope() || is_script_scope();
+  inner_scope_ = nullptr;
+  sibling_ = nullptr;
+  unresolved_ = nullptr;
+#ifdef DEBUG
+  scope_name_ = nullptr;
+#endif
+  dynamics_ = nullptr;
   receiver_ = nullptr;
   new_target_ = nullptr;
   function_ = nullptr;
   arguments_ = nullptr;
   this_function_ = nullptr;
-  arity_ = 0;
-  has_simple_parameters_ = true;
-  rest_parameter_ = NULL;
-  rest_index_ = -1;
-}
-
-void Scope::SetDefaults() {
-#ifdef DEBUG
-  scope_name_ = nullptr;
-#endif
-  is_declaration_scope_ = false;
-  inner_scope_ = nullptr;
-  sibling_ = nullptr;
-  unresolved_ = nullptr;
-  dynamics_ = nullptr;
   scope_inside_with_ = false;
   scope_calls_eval_ = false;
   has_arguments_parameter_ = false;
@@ -214,14 +195,13 @@
   num_stack_slots_ = 0;
   num_heap_slots_ = 0;
   num_global_slots_ = 0;
+  arity_ = 0;
+  has_simple_parameters_ = true;
+  rest_parameter_ = NULL;
+  rest_index_ = -1;
   start_position_ = kNoSourcePosition;
   end_position_ = kNoSourcePosition;
   is_hidden_ = false;
-}
-
-bool Scope::HasSimpleParameters() {
-  DeclarationScope* scope = GetClosureScope();
-  return !scope->is_function_scope() || scope->has_simple_parameters();
 }
 
 Scope* Scope::DeserializeScopeChain(Isolate* isolate, Zone* zone,
@@ -243,23 +223,18 @@
       }
     } else if (context->IsScriptContext()) {
       ScopeInfo* scope_info = context->scope_info();
-      current_scope = new (zone) DeclarationScope(
-          zone, current_scope, SCRIPT_SCOPE, Handle<ScopeInfo>(scope_info));
+      current_scope = new (zone) Scope(zone, current_scope, SCRIPT_SCOPE,
+                                       Handle<ScopeInfo>(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));
+      current_scope = new (zone) Scope(zone, current_scope, FUNCTION_SCOPE,
+                                       Handle<ScopeInfo>(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();
-      if (scope_info->is_declaration_scope()) {
-        current_scope = new (zone) DeclarationScope(
-            zone, current_scope, BLOCK_SCOPE, Handle<ScopeInfo>(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,
+                                       Handle<ScopeInfo>(scope_info));
     } else {
       DCHECK(context->IsCatchContext());
       String* name = context->catch_name();
@@ -344,47 +319,36 @@
       VariableProxy* proxy = factory.NewVariableProxy(result);
       VariableDeclaration* declaration =
           factory.NewVariableDeclaration(proxy, mode, this, kNoSourcePosition);
-      AsDeclarationScope()->DeclareFunctionVar(declaration);
+      DeclareFunctionVar(declaration);
       result->AllocateTo(VariableLocation::CONTEXT, index);
     }
   }
 
   scope_info_ = Handle<ScopeInfo>::null();
-}
-
-DeclarationScope* Scope::AsDeclarationScope() {
-  DCHECK(is_declaration_scope());
-  return static_cast<DeclarationScope*>(this);
-}
-
-const DeclarationScope* Scope::AsDeclarationScope() const {
-  DCHECK(is_declaration_scope());
-  return static_cast<const DeclarationScope*>(this);
-}
-
-int Scope::num_parameters() const {
-  return is_declaration_scope() ? AsDeclarationScope()->num_parameters() : 0;
 }
 
 bool Scope::Analyze(ParseInfo* info) {
   DCHECK(info->literal() != NULL);
   DCHECK(info->scope() == NULL);
-  DeclarationScope* scope = info->literal()->scope();
-  DeclarationScope* top = scope;
+  Scope* scope = info->literal()->scope();
+  Scope* top = scope;
 
   // Traverse the scope tree up to the first unresolved scope or the global
   // scope and start scope resolution and variable allocation from that scope.
-  // Such a scope is always a closure-scope, so always skip to the next closure
-  // scope.
   while (!top->is_script_scope() &&
          !top->outer_scope()->already_resolved()) {
-    top = top->outer_scope()->GetClosureScope();
+    top = top->outer_scope();
   }
 
   // Allocate the variables.
   {
     AstNodeFactory ast_node_factory(info->ast_value_factory());
-    if (!top->AllocateVariables(info, &ast_node_factory)) return false;
+    if (!top->AllocateVariables(info, &ast_node_factory)) {
+      DCHECK(top->pending_error_handler_.has_pending_error());
+      top->pending_error_handler_.ThrowPendingError(info->isolate(),
+                                                    info->script());
+      return false;
+    }
   }
 
 #ifdef DEBUG
@@ -400,7 +364,7 @@
   return true;
 }
 
-void DeclarationScope::DeclareThis(AstValueFactory* ast_value_factory) {
+void Scope::DeclareThis(AstValueFactory* ast_value_factory) {
   DCHECK(!already_resolved());
   DCHECK(is_declaration_scope());
   DCHECK(has_this_declaration());
@@ -413,7 +377,7 @@
   receiver_ = var;
 }
 
-void DeclarationScope::DeclareDefaultFunctionVariables(
+void Scope::DeclareDefaultFunctionVariables(
     AstValueFactory* ast_value_factory) {
   DCHECK(is_function_scope());
   DCHECK(!is_arrow_scope());
@@ -439,6 +403,8 @@
 
 Scope* Sc…
(message too large)

[Michael Achenbach, 2016-08-05 12:08:01]

The CQ bit was checked by machenbach@chromium.org

[commit-bot: I haz the power, 2016-08-05 12:08:11]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-05 12:08:23]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-08-05 12:08:25]

Failed to apply patch for src/ast/scopes.cc:
While running git apply --index -3 -p1;
  error: patch failed: src/ast/scopes.cc:344
  Falling back to three-way merge...
  Applied patch to 'src/ast/scopes.cc' with conflicts.
  U src/ast/scopes.cc

Patch:       src/ast/scopes.cc
Index: src/ast/scopes.cc
diff --git a/src/ast/scopes.cc b/src/ast/scopes.cc
index
f272931b9258a01afe4573718db2861c322fc828..35507c36fb4221b838b52227201e48514d875c73
100644
--- a/src/ast/scopes.cc
+++ b/src/ast/scopes.cc
@@ -83,11 +83,19 @@
 // ----------------------------------------------------------------------------
 // Implementation of Scope
 
-Scope::Scope(Zone* zone, Scope* outer_scope, ScopeType scope_type)
+Scope::Scope(Zone* zone, Scope* outer_scope, ScopeType scope_type,
+             FunctionKind function_kind)
     : outer_scope_(outer_scope),
       variables_(zone),
+      temps_(4, zone),
+      params_(4, zone),
       decls_(4, zone),
+      module_descriptor_(scope_type == MODULE_SCOPE ? new (zone)
+                                                         
ModuleDescriptor(zone)
+                                                    : NULL),
+      sloppy_block_function_map_(zone),
       scope_type_(scope_type),
+      function_kind_(function_kind),
       already_resolved_(false) {
   SetDefaults();
   if (outer_scope == nullptr) {
@@ -106,38 +114,25 @@
   }
 }
 
-Scope::Snapshot::Snapshot(Scope* scope)
-    : outer_scope_(scope),
-      top_inner_scope_(scope->inner_scope_),
-      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) {
-  SetDefaults();
-}
-
 Scope::Scope(Zone* zone, Scope* inner_scope, ScopeType scope_type,
              Handle<ScopeInfo> scope_info)
     : outer_scope_(nullptr),
       variables_(zone),
+      temps_(4, zone),
+      params_(4, zone),
       decls_(4, zone),
-      scope_info_(scope_info),
+      module_descriptor_(nullptr),
+      sloppy_block_function_map_(zone),
       scope_type_(scope_type),
-      already_resolved_(true) {
+      function_kind_(scope_info.is_null() ? kNormalFunction
+                                          : scope_info->function_kind()),
+      already_resolved_(true),
+      scope_info_(scope_info) {
   SetDefaults();
   if (!scope_info.is_null()) {
     scope_calls_eval_ = scope_info->CallsEval();
     language_mode_ = scope_info->language_mode();
+    is_declaration_scope_ = scope_info->is_declaration_scope();
     num_heap_slots_ = scope_info_->ContextLength();
   }
   // Ensure at least MIN_CONTEXT_SLOTS to indicate a materialized context.
@@ -146,25 +141,17 @@
   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()),
-      temps_(4, zone),
-      params_(4, zone),
-      sloppy_block_function_map_(zone),
-      module_descriptor_(nullptr) {
-  SetDefaults();
-}
-
 Scope::Scope(Zone* zone, Scope* inner_scope,
              const AstRawString* catch_variable_name)
     : outer_scope_(nullptr),
       variables_(zone),
+      temps_(0, zone),
+      params_(0, zone),
       decls_(0, zone),
+      module_descriptor_(nullptr),
+      sloppy_block_function_map_(zone),
       scope_type_(CATCH_SCOPE),
+      function_kind_(kNormalFunction),
       already_resolved_(true) {
   SetDefaults();
   AddInnerScope(inner_scope);
@@ -177,28 +164,22 @@
   AllocateHeapSlot(variable);
 }
 
-void DeclarationScope::SetDefaults() {
-  is_declaration_scope_ = true;
+void Scope::SetDefaults() {
+  is_declaration_scope_ =
+      is_eval_scope() || is_function_scope() ||
+      is_module_scope() || is_script_scope();
+  inner_scope_ = nullptr;
+  sibling_ = nullptr;
+  unresolved_ = nullptr;
+#ifdef DEBUG
+  scope_name_ = nullptr;
+#endif
+  dynamics_ = nullptr;
   receiver_ = nullptr;
   new_target_ = nullptr;
   function_ = nullptr;
   arguments_ = nullptr;
   this_function_ = nullptr;
-  arity_ = 0;
-  has_simple_parameters_ = true;
-  rest_parameter_ = NULL;
-  rest_index_ = -1;
-}
-
-void Scope::SetDefaults() {
-#ifdef DEBUG
-  scope_name_ = nullptr;
-#endif
-  is_declaration_scope_ = false;
-  inner_scope_ = nullptr;
-  sibling_ = nullptr;
-  unresolved_ = nullptr;
-  dynamics_ = nullptr;
   scope_inside_with_ = false;
   scope_calls_eval_ = false;
   has_arguments_parameter_ = false;
@@ -214,14 +195,13 @@
   num_stack_slots_ = 0;
   num_heap_slots_ = 0;
   num_global_slots_ = 0;
+  arity_ = 0;
+  has_simple_parameters_ = true;
+  rest_parameter_ = NULL;
+  rest_index_ = -1;
   start_position_ = kNoSourcePosition;
   end_position_ = kNoSourcePosition;
   is_hidden_ = false;
-}
-
-bool Scope::HasSimpleParameters() {
-  DeclarationScope* scope = GetClosureScope();
-  return !scope->is_function_scope() || scope->has_simple_parameters();
 }
 
 Scope* Scope::DeserializeScopeChain(Isolate* isolate, Zone* zone,
@@ -243,23 +223,18 @@
       }
     } else if (context->IsScriptContext()) {
       ScopeInfo* scope_info = context->scope_info();
-      current_scope = new (zone) DeclarationScope(
-          zone, current_scope, SCRIPT_SCOPE, Handle<ScopeInfo>(scope_info));
+      current_scope = new (zone) Scope(zone, current_scope, SCRIPT_SCOPE,
+                                       Handle<ScopeInfo>(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));
+      current_scope = new (zone) Scope(zone, current_scope, FUNCTION_SCOPE,
+                                       Handle<ScopeInfo>(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();
-      if (scope_info->is_declaration_scope()) {
-        current_scope = new (zone) DeclarationScope(
-            zone, current_scope, BLOCK_SCOPE, Handle<ScopeInfo>(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,
+                                       Handle<ScopeInfo>(scope_info));
     } else {
       DCHECK(context->IsCatchContext());
       String* name = context->catch_name();
@@ -344,47 +319,36 @@
       VariableProxy* proxy = factory.NewVariableProxy(result);
       VariableDeclaration* declaration =
           factory.NewVariableDeclaration(proxy, mode, this, kNoSourcePosition);
-      AsDeclarationScope()->DeclareFunctionVar(declaration);
+      DeclareFunctionVar(declaration);
       result->AllocateTo(VariableLocation::CONTEXT, index);
     }
   }
 
   scope_info_ = Handle<ScopeInfo>::null();
-}
-
-DeclarationScope* Scope::AsDeclarationScope() {
-  DCHECK(is_declaration_scope());
-  return static_cast<DeclarationScope*>(this);
-}
-
-const DeclarationScope* Scope::AsDeclarationScope() const {
-  DCHECK(is_declaration_scope());
-  return static_cast<const DeclarationScope*>(this);
-}
-
-int Scope::num_parameters() const {
-  return is_declaration_scope() ? AsDeclarationScope()->num_parameters() : 0;
 }
 
 bool Scope::Analyze(ParseInfo* info) {
   DCHECK(info->literal() != NULL);
   DCHECK(info->scope() == NULL);
-  DeclarationScope* scope = info->literal()->scope();
-  DeclarationScope* top = scope;
+  Scope* scope = info->literal()->scope();
+  Scope* top = scope;
 
   // Traverse the scope tree up to the first unresolved scope or the global
   // scope and start scope resolution and variable allocation from that scope.
-  // Such a scope is always a closure-scope, so always skip to the next closure
-  // scope.
   while (!top->is_script_scope() &&
          !top->outer_scope()->already_resolved()) {
-    top = top->outer_scope()->GetClosureScope();
+    top = top->outer_scope();
   }
 
   // Allocate the variables.
   {
     AstNodeFactory ast_node_factory(info->ast_value_factory());
-    if (!top->AllocateVariables(info, &ast_node_factory)) return false;
+    if (!top->AllocateVariables(info, &ast_node_factory)) {
+      DCHECK(top->pending_error_handler_.has_pending_error());
+      top->pending_error_handler_.ThrowPendingError(info->isolate(),
+                                                    info->script());
+      return false;
+    }
   }
 
 #ifdef DEBUG
@@ -400,7 +364,7 @@
   return true;
 }
 
-void DeclarationScope::DeclareThis(AstValueFactory* ast_value_factory) {
+void Scope::DeclareThis(AstValueFactory* ast_value_factory) {
   DCHECK(!already_resolved());
   DCHECK(is_declaration_scope());
   DCHECK(has_this_declaration());
@@ -413,7 +377,7 @@
   receiver_ = var;
 }
 
-void DeclarationScope::DeclareDefaultFunctionVariables(
+void Scope::DeclareDefaultFunctionVariables(
     AstValueFactory* ast_value_factory) {
   DCHECK(is_function_scope());
   DCHECK(!is_arrow_scope());
@@ -439,6 +403,8 @@
 
 Scope* Sc…
(message too large)

[Michael Achenbach, 2016-08-05 12:35:42]

The CQ bit was checked by machenbach@chromium.org

[commit-bot: I haz the power, 2016-08-05 12:35:47]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-05 12:36:28]

Description was changed from

==========
Revert of Separate Scope into DeclarationScope and Scope (patchset #13 id:240001
of https://codereview.chromium.org/2209573002/ )

Reason for revert:
[Sheriff] Make leak checker unhappy:
https://build.chromium.org/p/client.v8/builders/V8%20Linux64%20-%20debug/buil...

Original issue's description:
> Separate Scope into DeclarationScope and Scope
> 
> This reduces peak zone memory usage by ~10% on codeload and ~5% on mandreel.
> 
> BUG=v8:5209
> 
> Committed: https://crrev.com/2648162dcfff622f8587cea2faa8c3af56456968
> Cr-Commit-Position: refs/heads/master@{#38367}

TBR=marja@chromium.org,mstarzinger@chromium.org,ahaas@chromium.org,adamk@chro...
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=v8:5209
==========

to

==========
Revert of Separate Scope into DeclarationScope and Scope (patchset #13 id:240001
of https://codereview.chromium.org/2209573002/ )

Reason for revert:
[Sheriff] Make leak checker unhappy:
https://build.chromium.org/p/client.v8/builders/V8%20Linux64%20-%20debug/buil...

Original issue's description:
> Separate Scope into DeclarationScope and Scope
> 
> This reduces peak zone memory usage by ~10% on codeload and ~5% on mandreel.
> 
> BUG=v8:5209
> 
> Committed: https://crrev.com/2648162dcfff622f8587cea2faa8c3af56456968
> Cr-Commit-Position: refs/heads/master@{#38367}

TBR=marja@chromium.org,mstarzinger@chromium.org,ahaas@chromium.org,adamk@chro...
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=v8:5209
==========

[commit-bot: I haz the power, 2016-08-05 12:36:30]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2016-08-05 12:37:32]

Description was changed from

==========
Revert of Separate Scope into DeclarationScope and Scope (patchset #13 id:240001
of https://codereview.chromium.org/2209573002/ )

Reason for revert:
[Sheriff] Make leak checker unhappy:
https://build.chromium.org/p/client.v8/builders/V8%20Linux64%20-%20debug/buil...

Original issue's description:
> Separate Scope into DeclarationScope and Scope
> 
> This reduces peak zone memory usage by ~10% on codeload and ~5% on mandreel.
> 
> BUG=v8:5209
> 
> Committed: https://crrev.com/2648162dcfff622f8587cea2faa8c3af56456968
> Cr-Commit-Position: refs/heads/master@{#38367}

TBR=marja@chromium.org,mstarzinger@chromium.org,ahaas@chromium.org,adamk@chro...
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=v8:5209
==========

to

==========
Revert of Separate Scope into DeclarationScope and Scope (patchset #13 id:240001
of https://codereview.chromium.org/2209573002/ )

Reason for revert:
[Sheriff] Make leak checker unhappy:
https://build.chromium.org/p/client.v8/builders/V8%20Linux64%20-%20debug/buil...

Original issue's description:
> Separate Scope into DeclarationScope and Scope
>
> This reduces peak zone memory usage by ~10% on codeload and ~5% on mandreel.
>
> BUG=v8:5209
>
> Committed: https://crrev.com/2648162dcfff622f8587cea2faa8c3af56456968
> Cr-Commit-Position: refs/heads/master@{#38367}

TBR=marja@chromium.org,mstarzinger@chromium.org,ahaas@chromium.org,adamk@chro...
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=v8:5209

Committed: https://crrev.com/2b6675c35051c522570f07e52349fd185bea7176
Cr-Commit-Position: refs/heads/master@{#38380}
==========

[commit-bot: I haz the power, 2016-08-05 12:37:33]

Patchset 1 (id:??) landed as
https://crrev.com/2b6675c35051c522570f07e52349fd185bea7176
Cr-Commit-Position: refs/heads/master@{#38380}