Bug 1528837 - Part 9: Rename ParserBase::foldConstants field to foldConstants_. r=Yoric
authorTooru Fujisawa <arai_a@mac.com>
Sun, 24 Feb 2019 03:29:55 +0000
changeset 518656 d5cfad78de33
parent 518655 3dbd995ed01a
child 518657 7c2a4feaec2c
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersYoric
bugs1528837
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1528837 - Part 9: Rename ParserBase::foldConstants field to foldConstants_. r=Yoric Differential Revision: https://phabricator.services.mozilla.com/D20221
js/src/frontend/Parser.cpp
js/src/frontend/Parser.h
--- a/js/src/frontend/Parser.cpp
+++ b/js/src/frontend/Parser.cpp
@@ -144,17 +144,17 @@ ParserBase::ParserBase(JSContext* cx, Li
       alloc_(alloc),
       anyChars(cx, options, thisForCtor()),
       traceListHead_(nullptr),
       pc_(nullptr),
       usedNames_(usedNames),
       ss(nullptr),
       sourceObject_(cx, sourceObject),
       keepAtoms_(cx),
-      foldConstants(foldConstants),
+      foldConstants_(foldConstants),
 #ifdef DEBUG
       checkOptionsCalled(false),
 #endif
       isUnexpectedEOF_(false),
       awaitHandling_(AwaitIsName),
       inParametersOfAsyncFunction_(false),
       parseGoal_(uint8_t(parseGoal)) {
   cx->frontendCollectionPool().addActiveCompilation();
@@ -386,17 +386,17 @@ typename ParseHandler::ListNodeType Gene
   TokenKind tt;
   if (!tokenStream.getToken(&tt, TokenStream::Operand)) {
     return null();
   }
   if (tt != TokenKind::Eof) {
     error(JSMSG_GARBAGE_AFTER_INPUT, "script", TokenKindToDesc(tt));
     return null();
   }
-  if (foldConstants) {
+  if (foldConstants_) {
     Node node = stmtList;
     // Don't constant-fold inside "use asm" code, as this could create a parse
     // tree that doesn't type-check as asm.js.
     if (!pc_->useAsmOrInsideUseAsm()) {
       if (!FoldConstants(cx_, &node, &handler)) {
         return null();
       }
     }
--- a/js/src/frontend/Parser.h
+++ b/js/src/frontend/Parser.h
@@ -266,17 +266,17 @@ class MOZ_STACK_CLASS ParserBase : priva
   ScriptSource* ss;
 
   RootedScriptSourceObject sourceObject_;
 
   /* Root atoms and objects allocated for the parsed tree. */
   AutoKeepAtoms keepAtoms_;
 
   // Perform constant-folding; must be true when interfacing with the emitter.
-  const bool foldConstants : 1;
+  const bool foldConstants_ : 1;
 
  protected:
 #if DEBUG
   /* Our fallible 'checkOptions' member function has been called. */
   bool checkOptionsCalled : 1;
 #endif
 
   /* Unexpected end of input, i.e. Eof not at top-level. */
@@ -721,17 +721,17 @@ class MOZ_STACK_CLASS GeneralParser : pu
   using Base::awaitIsKeyword;
   using Base::inParametersOfAsyncFunction;
   using Base::parseGoal;
 #if DEBUG
   using Base::checkOptionsCalled;
 #endif
   using Base::finishFunctionScopes;
   using Base::finishLexicalScope;
-  using Base::foldConstants;
+  using Base::foldConstants_;
   using Base::getFilename;
   using Base::hasUsedFunctionSpecialName;
   using Base::hasValidSimpleStrictParameterNames;
   using Base::isUnexpectedEOF_;
   using Base::keepAtoms_;
   using Base::nameIsArgumentsOrEval;
   using Base::newFunction;
   using Base::newFunctionBox;