Macintosh-SW/tenfourfox
1
0
Fork 0
mirror of https://github.com/classilla/tenfourfox.git synced 2024-06-25 20:29:33 +00:00
Code Issues Projects Releases Wiki Activity

Bug 1234717 - Fix upvar TDZ for block-scoped functions. (r=jorendorff)

Browse Source
This commit is contained in:
Shu-yu Guo 2016-01-05 18:36:36 -08:00 committed by Cameron Kaiser
parent a11dcf0ccb
commit 2ec542b5a3
2 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1793,7 +1793,6 @@ bool
Parser<FullParseHandler>::leaveFunction(ParseNode* fn, ParseContext<FullParseHandler>* outerpc,
FunctionSyntaxKind kind)
{
bool bodyLevel = outerpc->atBodyLevel();
FunctionBox* funbox = fn->pn_funbox;
MOZ_ASSERT(funbox == pc->sc->asFunctionBox());
@ -1863,10 +1862,10 @@ Parser<FullParseHandler>::leaveFunction(ParseNode* fn, ParseContext<FullParseHan
if (dn != outer_dn) {
if (ParseNode* pnu = dn->dn_uses) {
// In ES6, lexical bindings cannot be accessed until
// initialized. If we are parsing a body-level function,
// it is hoisted to the top, so we conservatively mark all
// uses linked to an outer lexical binding as needing TDZ
// checks. e.g.,
// initialized. If we are parsing a function statement it
// is hoisted to the top of its lexical scope, so we
// conservatively mark all uses linked to an outer lexical
// binding as needing TDZ checks. e.g.,
//
// function outer() {
// inner2();
@ -1889,7 +1888,7 @@ Parser<FullParseHandler>::leaveFunction(ParseNode* fn, ParseContext<FullParseHan
// be marked as needing dead zone checks.
RootedAtom name(context, atom);
bool markUsesAsLexical = outer_dn->isLexical() &&
(bodyLevel ||
(kind == Statement ||
IsNonDominatingInScopedSwitch(outerpc, name, outer_dn));
AssociateUsesWithOuterDefinition(pnu, dn, outer_dn, markUsesAsLexical);
}

30
js/src/tests/ecma_6/LexicalEnvironment/block-scoped-functions-hoisted-tdz.js Normal file
View File

@ -0,0 +1,30 @@
var log = "";
try {
(function() {
{
let y = f();
function f() { y; }
}
})()
} catch (e) {
log += e instanceof ReferenceError;
}
try {
function f() {
switch (1) {
case 0:
let x;
case 1:
(function() { x; })();
}
}
f();
} catch (e) {
log += e instanceof ReferenceError;
}
assertEq(log, "truetrue");
if ("reportCompare" in this)
reportCompare(true, true);