Move scope_uses_super_property_ to DeclarationScope

src/ast/scopes.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_AST_SCOPES_H_
 #define V8_AST_SCOPES_H_
 
 #include "src/ast/ast.h"
 #include "src/base/hashmap.h"
 #include "src/globals.h"
@@ skipping 213 matching lines @@
 
   // Inform the scope and outer scopes that the corresponding code contains an
   // eval call.
   void RecordEvalCall() {
     scope_calls_eval_ = true;
     for (Scope* scope = this; scope != nullptr; scope = scope->outer_scope()) {
       scope->inner_scope_calls_eval_ = true;
     }
   }
 
-  // Inform the scope that the corresponding code uses "super".
-  void RecordSuperPropertyUsage() { scope_uses_super_property_ = true; }
-
   // Set the language mode flag (unless disabled by a global flag).
   void SetLanguageMode(LanguageMode language_mode) {
     DCHECK(!is_module_scope() || is_strict(language_mode));
     set_language_mode(language_mode);
   }
 
   // Inform the scope that the scope may execute declarations nonlinearly.
   // Currently, the only nonlinear scope is a switch statement. The name is
   // more general in case something else comes up with similar control flow,
   // for example the ability to break out of something which does not have
@@ skipping 65 matching lines @@
   bool is_with_scope() const { return scope_type_ == WITH_SCOPE; }
   bool is_declaration_scope() const { return is_declaration_scope_; }
 
   // Information about which scopes calls eval.
   bool calls_eval() const { return scope_calls_eval_; }
   bool calls_sloppy_eval() const {
     return scope_calls_eval_ && is_sloppy(language_mode());
   }
   bool IsAsmModule() const;
   bool IsAsmFunction() const;
-  // Does this scope access "super" property (super.foo).
-  bool uses_super_property() const { return scope_uses_super_property_; }
   // Does this scope have the potential to execute declarations non-linearly?
   bool is_nonlinear() const { return scope_nonlinear_; }
 
   // Whether this needs to be represented by a runtime context.
   bool NeedsContext() const {
     // Catch scopes always have heap slots.
     DCHECK(!is_catch_scope() || num_heap_slots() > 0);
     return num_heap_slots() > 0;
   }
 
@@ skipping 177 matching lines @@
   const ScopeType scope_type_;
 
   // Scope-specific information computed during parsing.
   //
   // The language mode of this scope.
   STATIC_ASSERT(LANGUAGE_END == 2);
   bool is_strict_ : 1;
   // This scope or a nested catch scope or with scope contain an 'eval' call. At
   // the 'eval' call site this scope is the declaration scope.
   bool scope_calls_eval_ : 1;
-  // This scope uses "super" property ('super.foo').
-  bool scope_uses_super_property_ : 1;
   // This scope's declarations might not be executed in order (e.g., switch).
   bool scope_nonlinear_ : 1;
   bool is_hidden_ : 1;
   // Temporary workaround that allows masking of 'this' in debug-evalute scopes.
   bool is_debug_evaluate_scope_ : 1;
 
   bool inner_scope_calls_eval_ : 1;
   bool force_context_allocation_ : 1;
 
   // True if it holds 'var' declarations.
@@ skipping 136 matching lines @@
     // the assumptions explained above do not hold.
     return params_.Contains(variables_.Lookup(name));
   }
 
   FunctionKind function_kind() const { return function_kind_; }
 
   bool is_arrow_scope() const {
     return is_function_scope() && IsArrowFunction(function_kind_);
   }
 
+  // Inform the scope that the corresponding code uses "super".
+  void RecordSuperPropertyUsage() { scope_uses_super_property_ = true; }
+  // Does this scope access "super" property (super.foo).
+  bool uses_super_property() const { return scope_uses_super_property_; }
+
   bool NeedsHomeObject() const {
     return scope_uses_super_property_ ||
            (inner_scope_calls_eval_ && (IsConciseMethod(function_kind()) ||
                                         IsAccessorFunction(function_kind()) ||
                                         IsClassConstructor(function_kind())));
   }
 
   bool asm_module() const { return asm_module_; }
   void set_asm_module() { asm_module_ = true; }
   bool asm_function() const { return asm_function_; }
@@ skipping 190 matching lines @@
   const FunctionKind function_kind_;
 
   bool has_simple_parameters_ : 1;
   // This scope contains an "use asm" annotation.
   bool asm_module_ : 1;
   // This scope's outer context is an asm module.
   bool asm_function_ : 1;
   bool force_eager_compilation_ : 1;
   // This scope has a parameter called "arguments".
   bool has_arguments_parameter_ : 1;
+  // This scope uses "super" property ('super.foo').
+  bool scope_uses_super_property_ : 1;
 
   // Info about the parameter list of a function.
   int arity_;
   int rest_index_;
   Variable* rest_parameter_;
   // Compiler-allocated (user-invisible) temporaries.
   ZoneList<Variable*> temps_;
   // Parameter list in source order.
   ZoneList<Variable*> params_;
   // Map of function names to lists of functions defined in sloppy blocks
@@ skipping 25 matching lines @@
   void AllocateModuleVariables();
 
  private:
   ModuleDescriptor* module_descriptor_;
 };
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_AST_SCOPES_H_