Bug 1528837 - Part 7: Rename ParserBase::sourceObject field to sourceObject_. r=Yoric
authorTooru Fujisawa <arai_a@mac.com>
Sun, 24 Feb 2019 03:28:30 +0000
changeset 518654 c46a2d2f9b6119cbddb070e0806acd422a6ca7ec
parent 518653 bc91af3d40a4d1b6c703f55f9c7dea47f9da1af0
child 518655 3dbd995ed01a0a8fa36d147cdcf8604c20dd8213
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 7: Rename ParserBase::sourceObject field to sourceObject_. r=Yoric Differential Revision: https://phabricator.services.mozilla.com/D20219
js/src/frontend/Parser.cpp
js/src/frontend/Parser.h
--- a/js/src/frontend/Parser.cpp
+++ b/js/src/frontend/Parser.cpp
@@ -142,17 +142,17 @@ ParserBase::ParserBase(JSContext* cx, Li
     : AutoGCRooter(cx, AutoGCRooter::Tag::Parser),
       cx_(cx),
       alloc_(alloc),
       anyChars(cx, options, thisForCtor()),
       traceListHead_(nullptr),
       pc_(nullptr),
       usedNames_(usedNames),
       ss(nullptr),
-      sourceObject(cx, sourceObject),
+      sourceObject_(cx, sourceObject),
       keepAtoms(cx),
       foldConstants(foldConstants),
 #ifdef DEBUG
       checkOptionsCalled(false),
 #endif
       isUnexpectedEOF_(false),
       awaitHandling_(AwaitIsName),
       inParametersOfAsyncFunction_(false),
@@ -1711,17 +1711,17 @@ bool PerHandlerParser<SyntaxParseHandler
           LazyScript::NumInnerFunctionsLimit) {
     MOZ_ALWAYS_FALSE(abortIfSyntaxParser());
     return false;
   }
 
   FunctionBox* funbox = pc_->functionBox();
   RootedFunction fun(cx_, funbox->function());
   LazyScript* lazy = LazyScript::Create(
-      cx_, fun, sourceObject, pc_->closedOverBindingsForLazy(),
+      cx_, fun, sourceObject_, pc_->closedOverBindingsForLazy(),
       pc_->innerFunctionsForLazy, funbox->bufStart, funbox->bufEnd,
       funbox->toStringStart, funbox->startLine, funbox->startColumn,
       parseGoal());
   if (!lazy) {
     return false;
   }
 
   // Flags that need to be copied into the JSScript when we do the full
--- a/js/src/frontend/Parser.h
+++ b/js/src/frontend/Parser.h
@@ -260,17 +260,17 @@ class MOZ_STACK_CLASS ParserBase : priva
   /* innermost parse context (stack-allocated) */
   ParseContext* pc_;
 
   // For tracking used names in this parsing session.
   UsedNameTracker& usedNames_;
 
   ScriptSource* ss;
 
-  RootedScriptSourceObject sourceObject;
+  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;
 
  protected: