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

Bug 1177941 - Do not show warning about unreachable empty statement after return statement. r=Waldo

Browse Source
This commit is contained in:
Tooru Fujisawa 2015-06-30 19:24:28 +09:00
parent 9020fa5cde
commit ee4292f1cc
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/src/frontend/FullParseHandler.h
View File

@ -702,7 +702,8 @@ class FullParseHandler
bool isStatementPermittedAfterReturnStatement(ParseNode *node) {
ParseNodeKind kind = node->getKind();
return kind == PNK_FUNCTION || kind == PNK_VAR || kind == PNK_BREAK || kind == PNK_THROW;
return kind == PNK_FUNCTION || kind == PNK_VAR || kind == PNK_BREAK || kind == PNK_THROW ||
(kind == PNK_SEMI && !node->pn_kid);
}
inline bool finishInitializerAssignment(ParseNode* pn, ParseNode* init, JSOp op);

6
js/src/frontend/SyntaxParseHandler.h
View File

@ -45,6 +45,7 @@ class SyntaxParseHandler
NodeHoistableDeclaration,
NodeBreak,
NodeThrow,
NodeEmptyStatement,
NodeSuperProperty,
NodeSuperElement,
@ -294,7 +295,7 @@ class SyntaxParseHandler
Node newStatementList(unsigned blockid, const TokenPos& pos) { return NodeGeneric; }
void addStatementToList(Node list, Node stmt, ParseContext<SyntaxParseHandler>* pc) {}
bool prependInitialYield(Node stmtList, Node gen) { return true; }
Node newEmptyStatement(const TokenPos& pos) { return NodeGeneric; }
Node newEmptyStatement(const TokenPos& pos) { return NodeEmptyStatement; }
Node newExprStatement(Node expr, uint32_t end) {
return expr == NodeUnparenthesizedString ? NodeStringExprStatement : NodeGeneric;
@ -430,7 +431,8 @@ class SyntaxParseHandler
}
bool isStatementPermittedAfterReturnStatement(Node pn) {
return pn == NodeHoistableDeclaration || pn == NodeBreak || pn == NodeThrow;
return pn == NodeHoistableDeclaration || pn == NodeBreak || pn == NodeThrow ||
pn == NodeEmptyStatement;
}
void setOp(Node pn, JSOp op) {}

4
js/src/jit-test/tests/basic/statement-after-return.js
View File

@ -256,8 +256,8 @@ var f = new Function("return\\n");
// empty statement
testPass(`
function f() {
return
;
return;
; // empty statement
}
`);