From c7da43d2fc3766600bb9f374468410a3ecfc8f67 Mon Sep 17 00:00:00 2001 From: Benjamin Bouvier Date: Wed, 29 Aug 2018 11:58:12 +0200 Subject: [PATCH] Bug 1486731: Guard test against profiling mode enabled; r=me on a CLOSED TREE And also fix a build issue with the pre-declaration of ReadOnlyCompileOptions in vm/TraceLogging.h; --HG-- extra : rebase_source : bb17c13f370c1cef50f09370f4a5b5055dced909 --- js/src/jit-test/tests/wasm/regress/ion-callerfp-tag.js | 2 +- js/src/vm/TraceLogging.h | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/js/src/jit-test/tests/wasm/regress/ion-callerfp-tag.js b/js/src/jit-test/tests/wasm/regress/ion-callerfp-tag.js index d7313f7877c3..23a1ea7baf13 100644 --- a/js/src/jit-test/tests/wasm/regress/ion-callerfp-tag.js +++ b/js/src/jit-test/tests/wasm/regress/ion-callerfp-tag.js @@ -8,7 +8,7 @@ var lfModule = new WebAssembly.Module(wasmTextToBinary(` `)); enableGeckoProfiling(); -enableSingleStepProfiling(); +WasmHelpers.startProfiling(); setJitCompilerOption("ion.warmup.trigger", 20); Object.prototype[3] = 3; diff --git a/js/src/vm/TraceLogging.h b/js/src/vm/TraceLogging.h index 43a9bf4fe0d4..dda1d57b2e2d 100644 --- a/js/src/vm/TraceLogging.h +++ b/js/src/vm/TraceLogging.h @@ -14,6 +14,7 @@ #include #include "js/AllocPolicy.h" +#include "js/CompileOptions.h" #include "js/HashTable.h" #include "js/TypeDecls.h" #include "js/Vector.h" @@ -21,11 +22,6 @@ #include "vm/TraceLoggingGraph.h" #include "vm/TraceLoggingTypes.h" - -namespace JS { -class ReadOnlyCompileOptions; -} // namespace JS - namespace js { namespace jit {