Bug 1515623 - Make wasm::HasCachingSupport(cx) accurately represent testing flags (r=lth)
authorLuke Wagner <luke@mozilla.com>
Tue, 15 Jan 2019 15:21:17 -0600
changeset 511130 d6d74968b2741243af6942cc09b66dfea5456865
parent 511129 5e5b06dcc0c021a16df0a9a57d93a4b14b895e8b
child 511131 70f87448b9e46e5d4ca7c2965d210ec2f1d5acd3
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslth
bugs1515623
milestone66.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 1515623 - Make wasm::HasCachingSupport(cx) accurately represent testing flags (r=lth)
js/src/wasm/WasmCompile.cpp
--- a/js/src/wasm/WasmCompile.cpp
+++ b/js/src/wasm/WasmCompile.cpp
@@ -408,41 +408,38 @@ void CompilerEnvironment::computeParamet
     computeParameters(gcFeatureOptIn);
     return;
   }
 
   bool gcEnabled = args_->gcTypesConfigured == HasGcTypes::True &&
                    gcFeatureOptIn == HasGcTypes::True;
   bool argBaselineEnabled = args_->baselineEnabled || gcEnabled;
   bool argIonEnabled = args_->ionEnabled && !gcEnabled;
-  bool argTestTiering = args_->testTiering && !gcEnabled;
   bool argDebugEnabled = args_->debugEnabled;
 
   uint32_t codeSectionSize = 0;
 
   SectionRange range;
   if (StartsCodeSection(d.begin(), d.end(), &range)) {
     codeSectionSize = range.size;
   }
 
   // Attempt to default to ion if baseline is disabled.
-  bool baselineEnabled =
-      BaselineCanCompile() && (argBaselineEnabled || argTestTiering);
+  bool baselineEnabled = BaselineCanCompile() && argBaselineEnabled;
   bool debugEnabled = BaselineCanCompile() && argDebugEnabled;
-  bool ionEnabled =
-      IonCanCompile() && (argIonEnabled || !baselineEnabled || argTestTiering);
+  bool ionEnabled = IonCanCompile() && (argIonEnabled || !baselineEnabled);
 #ifdef ENABLE_WASM_CRANELIFT
   bool forceCranelift = args_->forceCranelift;
 #endif
 
   // HasCompilerSupport() should prevent failure here
   MOZ_RELEASE_ASSERT(baselineEnabled || ionEnabled);
 
   if (baselineEnabled && ionEnabled && !debugEnabled && CanUseExtraThreads() &&
-      (TieringBeneficial(codeSectionSize) || argTestTiering)) {
+      (TieringBeneficial(codeSectionSize) || args_->testTiering)) {
     mode_ = CompileMode::Tier1;
     tier_ = Tier::Baseline;
   } else {
     mode_ = CompileMode::Once;
     tier_ = debugEnabled || !ionEnabled ? Tier::Baseline : Tier::Optimized;
   }
 
   optimizedBackend_ = OptimizedBackend::Ion;