Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 21:28:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1593415 - fix reflection for nullish coalescing; r=jorendorff

Browse Source 
I forgot about Reflect.cpp after the initial changes and borked it. This fixes it!

Differential Revision: https://phabricator.services.mozilla.com/D51572

--HG--
extra : moz-landing-system : lando
This commit is contained in:
yulia 2019-11-05 14:59:21 +00:00
parent 634c8dd169
commit 92472ccbd7
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/src/builtin/ReflectParse.cpp
View File

@ -102,6 +102,7 @@ enum BinaryOperator {
BINOP_IN, BINOP_IN,
BINOP_INSTANCEOF, BINOP_INSTANCEOF,
BINOP_PIPELINE, BINOP_PIPELINE,
BINOP_COALESCE,
BINOP_LIMIT BINOP_LIMIT
}; };
@ -178,6 +179,7 @@ static const char* const binopNames[] = {
"in", /* BINOP_IN */ "in", /* BINOP_IN */
"instanceof", /* BINOP_INSTANCEOF */ "instanceof", /* BINOP_INSTANCEOF */
"|>", /* BINOP_PIPELINE */ "|>", /* BINOP_PIPELINE */
"??", /* BINOP_COALESCE */
}; };
static const char* const unopNames[] = { static const char* const unopNames[] = {
@ -1827,6 +1829,8 @@ BinaryOperator ASTSerializer::binop(ParseNodeKind kind) {
return BINOP_INSTANCEOF; return BINOP_INSTANCEOF;
case ParseNodeKind::PipelineExpr: case ParseNodeKind::PipelineExpr:
return BINOP_PIPELINE; return BINOP_PIPELINE;
case ParseNodeKind::CoalesceExpr:
return BINOP_COALESCE;
default: default:
return BINOP_ERR; return BINOP_ERR;
} }
@ -2565,9 +2569,8 @@ bool ASTSerializer::leftAssociate(ListNode* node, MutableHandleValue dst) {
MOZ_ASSERT(!node->empty()); MOZ_ASSERT(!node->empty());
ParseNodeKind kind = node->getKind(); ParseNodeKind kind = node->getKind();
bool lor = bool lor = kind == ParseNodeKind::OrExpr;
kind == ParseNodeKind::OrExpr || kind == ParseNodeKind::CoalesceExpr; bool logop = lor || kind == ParseNodeKind::AndExpr;
bool logop = lor || (kind == ParseNodeKind::AndExpr);
ParseNode* head = node->head(); ParseNode* head = node->head();
RootedValue left(cx); RootedValue left(cx);
@ -2680,6 +2683,7 @@ bool ASTSerializer::expression(ParseNode* pn, MutableHandleValue dst) {
dst); dst);
} }
case ParseNodeKind::CoalesceExpr:
case ParseNodeKind::OrExpr: case ParseNodeKind::OrExpr:
case ParseNodeKind::AndExpr: case ParseNodeKind::AndExpr:
return leftAssociate(&pn->as<ListNode>(), dst); return leftAssociate(&pn->as<ListNode>(), dst);