Macintosh-SW/tenfourfox
1
0
Fork 0
mirror of https://github.com/classilla/tenfourfox.git synced 2025-04-17 20:39:07 +00:00
Code Issues Projects Releases Wiki Activity

#372: merge changeset 303861

Browse Source
This commit is contained in:
Cameron Kaiser 2017-05-09 19:28:37 -07:00
parent 069a26bf9a
commit 745f7e7a2f
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
js/src/frontend/Parser.cpp
View File

@ -3607,8 +3607,41 @@ Parser<FullParseHandler>::bindLexical(BindData<FullParseHandler>* data,
// The reason we compare using >= instead of == on the block id is to
// detect redeclarations where a 'var' binding first appeared in a
// nested block: |{ var x; } let x;|
if (dn && dn->pn_blockid >= pc->blockid())
if (dn && dn->pn_blockid >= pc->blockid()) {
// XXXshu Used only for phasing in block-scope function early
// XXXshu errors.
// XXXshu
// XXXshu Back out when major version >= 50. See [1].
// XXXshu
// XXXshu [1] https://bugzilla.mozilla.org/show_bug.cgi?id=1235590#c10
if (pn->isKind(PNK_FUNCTION) && dn->isKind(PNK_FUNCTION) && !pc->sc->strict()) {
if (!parser->makeDefIntoUse(dn, pn, name))
return false;
MOZ_ASSERT(blockObj);
Shape* shape = blockObj->lastProperty()->search(cx, NameToId(name));
MOZ_ASSERT(shape);
uint32_t oldDefIndex = blockObj->shapeToIndex(*shape);
blockObj->updateDefinitionParseNode(oldDefIndex, dn,
reinterpret_cast<Definition*>(pn));
//parser->addTelemetry(JSCompartment::DeprecatedBlockScopeFunRedecl);
JSAutoByteString bytes;
if (!AtomToPrintableString(cx, name, &bytes))
return false;
if (!parser->report(ParseWarning, false, null(),
JSMSG_DEPRECATED_BLOCK_SCOPE_FUN_REDECL,
bytes.ptr()))
{
return false;
}
return true;
}
return parser->reportRedeclaration(pn, dn->kind(), name);
}
if (!pc->define(parser->tokenStream, name, pn, bindingKind))
return false;
}