Revert "deps: V8: cherry-pick f9257802c1c0"

This reverts commit 75da64c. PR-URL: #32521 Refs: v8/v8@8.1.307.20...8.1.307.26 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
nodejs · Apr 7, 2020 · a9e4cec · a9e4cec
1 parent d5da970
commit a9e4cec
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 21 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/deps/v8/test/message/fail/hashbang-incomplete-string.out b/deps/v8/test/message/fail/hashbang-incomplete-string.out