Remove ast_value_factory_ and usages from scope

src/parsing/parser-base.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_PARSING_PARSER_BASE_H
 #define V8_PARSING_PARSER_BASE_H
 
 #include "src/ast/scopes.h"
 #include "src/bailout-reason.h"
 #include "src/base/hashmap.h"
@@ skipping 600 matching lines @@
     }
 
    private:
     ParserBase* parser_;
     Mode old_mode_;
   };
 
   Scope* NewScope(Scope* parent, ScopeType scope_type) {
     // Must always pass the function kind for FUNCTION_SCOPE.
     DCHECK(scope_type != FUNCTION_SCOPE);
-    return NewScope(parent, scope_type, kNormalFunction);
-  }
-
-  Scope* NewScope(Scope* parent, ScopeType scope_type, FunctionKind kind) {
-    DCHECK(ast_value_factory());
-    Scope* result = new (zone())
-        Scope(zone(), parent, scope_type, ast_value_factory(), kind);
+    Scope* result =
+        new (zone()) Scope(zone(), parent, scope_type, kNormalFunction);
     result->Initialize();
+    if (scope_type == MODULE_SCOPE) result->DeclareThis(ast_value_factory());
     return result;
   }
 
+  Scope* NewFunctionScope(Scope* parent, FunctionKind kind) {
+    DCHECK(ast_value_factory());
+    Scope* result = new (zone()) Scope(zone(), parent, FUNCTION_SCOPE, kind);
+    result->Initialize();
+    if (!IsArrowFunction(kind)) {
+      result->DeclareThis(ast_value_factory());
+      result->DeclareDefaultFunctionVariables(ast_value_factory());
+    }
+    return result;
+  }
+
   Scanner* scanner() const { return scanner_; }
   AstValueFactory* ast_value_factory() const { return ast_value_factory_; }
   int position() { return scanner_->location().beg_pos; }
   int peek_position() { return scanner_->peek_location().beg_pos; }
   bool stack_overflow() const { return stack_overflow_; }
   void set_stack_overflow() { stack_overflow_ = true; }
   Mode mode() const { return mode_; }
   Zone* zone() const { return zone_; }
 
   INLINE(Token::Value peek()) {
@@ skipping 1658 matching lines @@
                                   parenthesized_formals, is_async, CHECK_OK);
     // This reads strangely, but is correct: it checks whether any
     // sub-expression of the parameter list failed to be a valid formal
     // parameter initializer. Since YieldExpressions are banned anywhere
     // in an arrow parameter list, this is correct.
     // TODO(adamk): Rename "FormalParameterInitializerError" to refer to
     // "YieldExpression", which is its only use.
     ValidateFormalParameterInitializer(&arrow_formals_classifier, ok);
 
     Scanner::Location loc(lhs_beg_pos, scanner()->location().end_pos);
-    Scope* scope = this->NewScope(this->scope(), FUNCTION_SCOPE,
-                                  is_async ? FunctionKind::kAsyncArrowFunction
-                                           : FunctionKind::kArrowFunction);
+    Scope* scope = this->NewFunctionScope(
+        this->scope(), is_async ? FunctionKind::kAsyncArrowFunction
+                                : FunctionKind::kArrowFunction);
     // Because the arrow's parameters were parsed in the outer scope, any
     // usage flags that might have been triggered there need to be copied
     // to the arrow scope.
     this->scope()->PropagateUsageFlagsToScope(scope);
     FormalParametersT parameters(scope);
     if (!arrow_formals_classifier.is_simple_parameter_list()) {
       scope->SetHasNonSimpleParameters();
       parameters.is_simple = false;
     }
 
@@ skipping 1354 matching lines @@
     has_seen_constructor_ = true;
     return;
   }
 }
 
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_PARSING_PARSER_BASE_H