Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-15 06:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 858060 - Throw SyntaxError on module syntax. Fix bogus assertion. r=jorendorff.

Browse Source 
--HG--
extra : rebase_source : ea25ab9fa70ff070ab85a5d4187d9b7312817557
This commit is contained in:
Eddy Bruel 2013-06-05 14:17:43 -05:00
parent aafbec68ce
commit 0bddaed1a5
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/src/frontend/BytecodeEmitter.cpp
View File

@ -6027,6 +6027,11 @@ frontend::EmitTree(JSContext *cx, BytecodeEmitter *bce, ParseNode *pn)
JS_ASSERT(pn->getArity() == PN_NULLARY);
break;
case PNK_MODULE:
// TODO: Add emitter support for modules
bce->reportError(NULL, JSMSG_SYNTAX_ERROR);
return false;
default:
JS_ASSERT(0);
}

5
js/src/frontend/FoldConstants.cpp
View File

@ -247,8 +247,11 @@ FoldConstants<FullParseHandler>(JSContext *cx, ParseNode **pnp,
switch (pn->getArity()) {
case PN_CODE:
if (pn->pn_funbox->useAsmOrInsideUseAsm() && cx->hasOption(JSOPTION_ASMJS))
if (pn->isKind(PNK_FUNCTION) &&
pn->pn_funbox->useAsmOrInsideUseAsm() && cx->hasOption(JSOPTION_ASMJS))
{
return true;
}
if (pn->getKind() == PNK_MODULE) {
if (!FoldConstants(cx, &pn->pn_body, parser))
return false;

2
js/src/frontend/NameFunctions.cpp
View File

@ -316,7 +316,7 @@ class NameResolver
resolve(cur->pn_kid3, prefix);
break;
case PN_CODE:
JS_ASSERT(cur->isKind(PNK_FUNCTION));
JS_ASSERT(cur->isKind(PNK_MODULE) || cur->isKind(PNK_FUNCTION));
resolve(cur->pn_body, prefix);
break;
case PN_LIST: