wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-05 07:18:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #2298 - Support '#x in obj' ergonomic brand check syntax

Browse source
This commit is contained in:
Martok 2023-08-29 23:51:32 +02:00 • committed by roytam1
commit 6ff7b5269e
3 changed files with 40 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
js/src/frontend/BytecodeEmitter.cpp
View file

@ -7754,10 +7754,23 @@ bool
BytecodeEmitter::emitLeftAssociative(ListNode* node)
{
// Left-associative operator chain.
if (!emitTree(node->head()))
return false;
JSOp op = node->getOp();
ParseNode* nextExpr = node->head()->pn_next;
ParseNode* headExpr = node->head();
if (op == JSOP_IN && headExpr->isKind(PNK_NAME) && headExpr->as<NameNode>().isPrivateName()) {
// {Goanna} The only way a "naked" private name can show up as the leftmost side of an in-chain
// is from an ergonomic brand check (`this.#x in ...` would be a PNK_DOT child node).
// Instead of going through the emitTree machinery, we pretend that this identifier
// reference is actually a string, which allows us to use the JSOP_IN interpreter routines.
// This erroneously doesn't call updateLineNumberNotes, but this is not a big issue:
// the begin pos is correct as we're on the start of the current tree, the end is on the
// same line anyway.
if (!emitAtomOp(headExpr->as<NameNode>().atom(), JSOP_STRING))
return false;
} else {
if (!emitTree(headExpr))
return false;
}
ParseNode* nextExpr = headExpr->pn_next;
do {
if (!emitTree(nextExpr))
return false;

24
js/src/frontend/Parser.cpp
View file

@ -8949,6 +8949,15 @@ Parser<ParseHandler>::orExpr1(InHandling inHandling, YieldHandling yieldHandling
if (!tokenStream.getToken(&tok))
return null();
// Ensure that if we have a private name lhs we are legally constructing a
// `#x in obj` expression:
if (handler.isPrivateName(pn)) {
if (tok != TOK_IN) {
error(JSMSG_ILLEGAL_PRIVATE_NAME);
return null();
}
}
ParseNodeKind pnk;
if (tok == TOK_IN ? inHandling == InAllowed : TokenKindIsBinaryOp(tok)) {
// We're definitely not in a destructuring context, so report any
@ -8985,7 +8994,20 @@ Parser<ParseHandler>::orExpr1(InHandling inHandling, YieldHandling yieldHandling
// If we have not detected a mixing error at this point, record that
// we have an unparenthesized expression, in case we have one later.
unparenthesizedExpression = EnforcedParentheses::CoalesceExpr;
break;
break;
case TOK_IN:
// if the LHS is a private name, and the operator is In,
// ensure we're construcing an ergonomic brand check of
// '#x in y', rather than having a higher precedence operator
// like + cause a different reduction, such as
// 1 + #x in y.
if (handler.isPrivateName(pn)) {
if (depth > 0 && Precedence(kindStack[depth - 1]) >= Precedence(PNK_IN)) {
error(JSMSG_ILLEGAL_PRIVATE_NAME);
return null();
}
}
break;
default:
// Do nothing in other cases.
break;

1
js/src/js.msg
View file

@ -364,6 +364,7 @@ MSG_DEF(JSMSG_BAD_NEW_OPTIONAL, 0, JSEXN_SYNTAXERR, "new keyword cannot b
MSG_DEF(JSMSG_BAD_OPTIONAL_TEMPLATE, 0, JSEXN_SYNTAXERR, "tagged template cannot be used with optional chain")
MSG_DEF(JSMSG_ESCAPED_KEYWORD, 0, JSEXN_SYNTAXERR, "keywords must be written literally, without embedded escapes")
MSG_DEF(JSMSG_FIELDS_NOT_SUPPORTED, 0, JSEXN_SYNTAXERR, "fields are not currently supported")
MSG_DEF(JSMSG_ILLEGAL_PRIVATE_NAME, 0, JSEXN_SYNTAXERR, "private names aren't valid in this context")
// asm.js
MSG_DEF(JSMSG_USE_ASM_TYPE_FAIL, 1, JSEXN_TYPEERR, "asm.js type error: {0}")