diff --git a/js/src/frontend/FullParseHandler.h b/js/src/frontend/FullParseHandler.h index 49dd5c95bff..f148fbb6957 100644 --- a/js/src/frontend/FullParseHandler.h +++ b/js/src/frontend/FullParseHandler.h @@ -27,7 +27,6 @@ class FullParseHandler { ParseNodeAllocator allocator; TokenStream &tokenStream; - bool foldConstants; ParseNode *allocParseNode(size_t size) { MOZ_ASSERT(size == sizeof(ParseNode)); @@ -71,11 +70,10 @@ class FullParseHandler typedef Definition *DefinitionNode; FullParseHandler(ExclusiveContext *cx, LifoAlloc &alloc, - TokenStream &tokenStream, bool foldConstants, - Parser *syntaxParser, LazyScript *lazyOuterFunction) + TokenStream &tokenStream, Parser *syntaxParser, + LazyScript *lazyOuterFunction) : allocator(cx, alloc), tokenStream(tokenStream), - foldConstants(foldConstants), lazyOuterFunction_(lazyOuterFunction), lazyInnerFunctionIndex(0), syntaxParser(syntaxParser) @@ -220,7 +218,7 @@ class FullParseHandler ParseNode *appendOrCreateList(ParseNodeKind kind, ParseNode *left, ParseNode *right, ParseContext *pc, JSOp op = JSOP_NOP) { - return ParseNode::appendOrCreateList(kind, op, left, right, this, pc, foldConstants); + return ParseNode::appendOrCreateList(kind, op, left, right, this, pc); } ParseNode *newTernary(ParseNodeKind kind, diff --git a/js/src/frontend/ParseNode.cpp b/js/src/frontend/ParseNode.cpp index 7d491e6fd66..dacf3ff1412 100644 --- a/js/src/frontend/ParseNode.cpp +++ b/js/src/frontend/ParseNode.cpp @@ -246,8 +246,7 @@ ParseNodeAllocator::allocNode() ParseNode * ParseNode::appendOrCreateList(ParseNodeKind kind, JSOp op, ParseNode *left, ParseNode *right, - FullParseHandler *handler, ParseContext *pc, - bool foldConstants) + FullParseHandler *handler, ParseContext *pc) { // The asm.js specification is written in ECMAScript grammar terms that // specify *only* a binary tree. It's a royal pain to implement the asm.js diff --git a/js/src/frontend/ParseNode.h b/js/src/frontend/ParseNode.h index 29244cf66bd..31b548ebd05 100644 --- a/js/src/frontend/ParseNode.h +++ b/js/src/frontend/ParseNode.h @@ -651,8 +651,7 @@ class ParseNode */ static ParseNode * appendOrCreateList(ParseNodeKind kind, JSOp op, ParseNode *left, ParseNode *right, - FullParseHandler *handler, ParseContext *pc, - bool foldConstants); + FullParseHandler *handler, ParseContext *pc); inline PropertyName *name() const; inline JSAtom *atom() const; diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp index 13195084ac2..8260516b882 100644 --- a/js/src/frontend/Parser.cpp +++ b/js/src/frontend/Parser.cpp @@ -516,7 +516,7 @@ Parser::Parser(ExclusiveContext *cx, LifoAlloc *alloc, sawDeprecatedExpressionClosure(false), sawDeprecatedLetBlock(false), sawDeprecatedLetExpression(false), - handler(cx, *alloc, tokenStream, foldConstants, syntaxParser, lazyOuterFunction) + handler(cx, *alloc, tokenStream, syntaxParser, lazyOuterFunction) { { AutoLockForExclusiveAccess lock(cx); diff --git a/js/src/frontend/SyntaxParseHandler.h b/js/src/frontend/SyntaxParseHandler.h index 1600cd9aa5b..529dd37223f 100644 --- a/js/src/frontend/SyntaxParseHandler.h +++ b/js/src/frontend/SyntaxParseHandler.h @@ -97,8 +97,8 @@ class SyntaxParseHandler public: SyntaxParseHandler(ExclusiveContext *cx, LifoAlloc &alloc, - TokenStream &tokenStream, bool foldConstants, - Parser *syntaxParser, LazyScript *lazyOuterFunction) + TokenStream &tokenStream, Parser *syntaxParser, + LazyScript *lazyOuterFunction) : lastAtom(nullptr), tokenStream(tokenStream) {}