Bug 1638006 - Removed missed piece of optional parser allocation deferral r=caroline
authorMatthew Gaudet <mgaudet@mozilla.com>
Thu, 14 May 2020 18:13:51 +0000
changeset 530174 8cd199704d1e16abba728f0a6c394d65b8e46834
parent 530173 09976687c44cce101946de2c0031826640ce42cc
child 530175 f12050b298470f8bc99e19c1976a1eed3cf63f21
push id37419
push userarchaeopteryx@coole-files.de
push dateFri, 15 May 2020 09:33:04 +0000
treeherdermozilla-central@5a0a960a8d55 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscaroline
bugs1638006
milestone78.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 1638006 - Removed missed piece of optional parser allocation deferral r=caroline Differential Revision: https://phabricator.services.mozilla.com/D75324
js/src/shell/js.cpp
js/src/shell/jsshell.h
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -488,17 +488,16 @@ struct ShellCompartmentPrivate {
 struct MOZ_STACK_CLASS EnvironmentPreparer
     : public js::ScriptEnvironmentPreparer {
   explicit EnvironmentPreparer(JSContext* cx) {
     js::SetScriptEnvironmentPreparer(cx, this);
   }
   void invoke(JS::HandleObject global, Closure& closure) override;
 };
 
-bool shell::enableDeferredMode = true;
 bool shell::enableCodeCoverage = false;
 bool shell::enableDisassemblyDumps = false;
 bool shell::offthreadCompilation = false;
 bool shell::enableAsmJS = false;
 bool shell::enableWasm = false;
 bool shell::enableSharedMemory = SHARED_MEMORY_DEFAULT;
 bool shell::enableWasmBaseline = false;
 bool shell::enableWasmIon = false;
@@ -11710,19 +11709,16 @@ int main(int argc, char** argv, char** e
     js::DisableExtraThreads();
   }
 
   enableCodeCoverage = op.getBoolOption("code-coverage");
   if (enableCodeCoverage) {
     coverage::EnableLCov();
   }
 
-  enableDeferredMode = !op.getBoolOption("disable-parser-deferred-alloc") &&
-                       getenv("DISABLE_PARSER_DEFERRED_ALLOC") == nullptr;
-
 #ifdef JS_WITHOUT_NSPR
   if (!op.getMultiStringOption("dll").empty()) {
     fprintf(stderr, "Error: --dll requires NSPR support!\n");
     return EXIT_FAILURE;
   }
 #else
   AutoLibraryLoader loader;
   MultiStringRange dllPaths = op.getMultiStringOption("dll");
--- a/js/src/shell/jsshell.h
+++ b/js/src/shell/jsshell.h
@@ -92,17 +92,16 @@ struct RCFile {
   bool release();
 };
 
 // Shell command-line arguments and count.
 extern int sArgc;
 extern char** sArgv;
 
 // Shell state set once at startup.
-extern bool enableDeferredMode;
 extern bool enableCodeCoverage;
 extern bool enableDisassemblyDumps;
 extern bool offthreadCompilation;
 extern bool enableAsmJS;
 extern bool enableWasm;
 extern bool enableSharedMemory;
 extern bool enableWasmBaseline;
 extern bool enableWasmIon;