AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[scanner] Combine surrogate pairs at start when scanning private names

Browse Source 
Bug: v8:12523
Change-Id: Ic3779fe6f20965d177d99d0a570a735df72e4fde
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3366994
Reviewed-by: Leszek Swirski <leszeks@chromium.org>
Commit-Queue: Shu-yu Guo <syg@chromium.org>
Cr-Commit-Position: refs/heads/main@{#78493}
This commit is contained in:
Shu-yu Guo 2022-01-04 14:25:01 -08:00 committed by V8 LUCI CQ
parent 8393133d6d
commit c7c5b49298
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/parsing/scanner.cc
View File

@ -497,15 +497,17 @@ Token::Value Scanner::ScanPrivateName() {
next().literal_chars.Start();
DCHECK_EQ(c0_, '#');
DCHECK(!IsIdentifierStart(kEndOfInput));
if (!IsIdentifierStart(Peek())) {
ReportScannerError(source_pos(),
MessageTemplate::kInvalidOrUnexpectedToken);
return Token::ILLEGAL;
Advance();
if (IsIdentifierStart(c0_) ||
(CombineSurrogatePair() && IsIdentifierStart(c0_))) {
AddLiteralChar('#');
Token::Value token = ScanIdentifierOrKeywordInner();
return token == Token::ILLEGAL ? Token::ILLEGAL : Token::PRIVATE_NAME;
}
AddLiteralCharAdvance();
Token::Value token = ScanIdentifierOrKeywordInner();
return token == Token::ILLEGAL ? Token::ILLEGAL : Token::PRIVATE_NAME;
PushBack('#'); // Undo Advance()
ReportScannerError(source_pos(), MessageTemplate::kInvalidOrUnexpectedToken);
return Token::ILLEGAL;
}
Token::Value Scanner::ScanTemplateSpan() {

17
test/mjsunit/harmony/private-name-surrogate-pair.js Normal file
View File

@ -0,0 +1,17 @@
// Copyright 2022 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.
class C1 {
#𖥸 = 42;
m() { return this.#𖥸; }
}
assertEquals((new C1).m(), 42);
class C2 {
#𖥸() { return 42; }
m() { return this.#𖥸(); }
}
assertEquals((new C2).m(), 42);