From a9e4cec70db3afd1e201199af524225ead1d619d Mon Sep 17 00:00:00 2001
From: Matheus Marchini <mmarchini@netflix.com>
Date: Fri, 27 Mar 2020 11:08:14 -0700
Subject: [PATCH] Revert "deps: V8: cherry-pick f9257802c1c0"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 75da64c0587f2925319cd9c1717a19b647b93511.

PR-URL: https://github.com/nodejs/node/pull/32521
Refs: https://github.com/v8/v8/compare/8.1.307.20...8.1.307.26
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
 deps/v8/src/parsing/parser.cc                        |  1 +
 deps/v8/src/parsing/preparser.cc                     |  4 ++++
 deps/v8/src/parsing/scanner-inl.h                    |  4 ----
 deps/v8/src/parsing/scanner.cc                       |  7 +++++++
 deps/v8/src/parsing/scanner.h                        |  3 +++
 .../test/message/fail/hashbang-incomplete-string.js  | 12 ------------
 .../test/message/fail/hashbang-incomplete-string.out |  5 -----
 7 files changed, 15 insertions(+), 21 deletions(-)
 delete mode 100644 deps/v8/test/message/fail/hashbang-incomplete-string.js
 delete mode 100644 deps/v8/test/message/fail/hashbang-incomplete-string.out

diff --git a/deps/v8/src/parsing/parser.cc b/deps/v8/src/parsing/parser.cc
index 21beff8790c665..029caf2524f563 100644
--- a/deps/v8/src/parsing/parser.cc
+++ b/deps/v8/src/parsing/parser.cc
@@ -505,6 +505,7 @@ FunctionLiteral* Parser::ParseProgram(Isolate* isolate, Handle<Script> script,
                         Scope::DeserializationMode::kIncludingVariables);
 
   scanner_.Initialize();
+  scanner_.SkipHashBang();
   FunctionLiteral* result = DoParseProgram(isolate, info);
   MaybeResetCharacterStream(info, result);
   MaybeProcessSourceRanges(info, result, stack_limit_);
diff --git a/deps/v8/src/parsing/preparser.cc b/deps/v8/src/parsing/preparser.cc
index 464e8e7b17cab7..5ed443f45e6600 100644
--- a/deps/v8/src/parsing/preparser.cc
+++ b/deps/v8/src/parsing/preparser.cc
@@ -75,6 +75,10 @@ PreParser::PreParseResult PreParser::PreParseProgram() {
   scope->set_is_being_lazily_parsed(true);
 #endif
 
+  // Note: We should only skip the hashbang in non-Eval scripts
+  // (currently, Eval is not handled by the PreParser).
+  scanner()->SkipHashBang();
+
   // ModuleDeclarationInstantiation for Source Text Module Records creates a
   // new Module Environment Record whose outer lexical environment record is
   // the global scope.
diff --git a/deps/v8/src/parsing/scanner-inl.h b/deps/v8/src/parsing/scanner-inl.h
index fc5194f263f9aa..ff75997ad6be83 100644
--- a/deps/v8/src/parsing/scanner-inl.h
+++ b/deps/v8/src/parsing/scanner-inl.h
@@ -506,10 +506,6 @@ V8_INLINE Token::Value Scanner::ScanSingleToken() {
           return ScanTemplateSpan();
 
         case Token::PRIVATE_NAME:
-          if (source_pos() == 0 && Peek() == '!') {
-            token = SkipSingleLineComment();
-            continue;
-          }
           return ScanPrivateName();
 
         case Token::WHITESPACE:
diff --git a/deps/v8/src/parsing/scanner.cc b/deps/v8/src/parsing/scanner.cc
index 5d5fbdbab6be47..70d278556cbf69 100644
--- a/deps/v8/src/parsing/scanner.cc
+++ b/deps/v8/src/parsing/scanner.cc
@@ -314,6 +314,13 @@ Token::Value Scanner::SkipMultiLineComment() {
   return Token::ILLEGAL;
 }
 
+void Scanner::SkipHashBang() {
+  if (c0_ == '#' && Peek() == '!' && source_pos() == 0) {
+    SkipSingleLineComment();
+    Scan();
+  }
+}
+
 Token::Value Scanner::ScanHtmlComment() {
   // Check for <!-- comments.
   DCHECK_EQ(c0_, '!');
diff --git a/deps/v8/src/parsing/scanner.h b/deps/v8/src/parsing/scanner.h
index 2e953f6e6ac9c1..4b858a33b66cea 100644
--- a/deps/v8/src/parsing/scanner.h
+++ b/deps/v8/src/parsing/scanner.h
@@ -422,6 +422,9 @@ class V8_EXPORT_PRIVATE Scanner {
 
   const Utf16CharacterStream* stream() const { return source_; }
 
+  // If the next characters in the stream are "#!", the line is skipped.
+  void SkipHashBang();
+
  private:
   // Scoped helper for saving & restoring scanner error state.
   // This is used for tagged template literals, in which normally forbidden
diff --git a/deps/v8/test/message/fail/hashbang-incomplete-string.js b/deps/v8/test/message/fail/hashbang-incomplete-string.js
deleted file mode 100644
index b3aab937db7c32..00000000000000
--- a/deps/v8/test/message/fail/hashbang-incomplete-string.js
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env d8
-// 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.
-//
-//
-
-const x = 'valid code';
-
-'incomplete string
-
-const y = 'even more valid code!';
diff --git a/deps/v8/test/message/fail/hashbang-incomplete-string.out b/deps/v8/test/message/fail/hashbang-incomplete-string.out
deleted file mode 100644
index db85fe06a69d8f..00000000000000
--- a/deps/v8/test/message/fail/hashbang-incomplete-string.out
+++ /dev/null
@@ -1,5 +0,0 @@
-*%(basename)s:10: SyntaxError: Invalid or unexpected token
-'incomplete string
-^^^^^^^^^^^^^^^^^^
-
-SyntaxError: Invalid or unexpected token