Bug 1041370 - Fix script entry hook #ifdefing (a=RyanVM)
authorBill McCloskey <wmccloskey@mozilla.com>
Sun, 20 Jul 2014 21:58:49 -0700
changeset 195225 e743fd8c57ed991b7a701f45199cb40cb0a0b806
parent 195224 4bafe35cfb6581bd57e6fec7330694f790208fba
child 195235 42c6a5418370d37323bc45c3d9fb355fb87ce0ad
push id27170
push userwmccloskey@mozilla.com
push dateMon, 21 Jul 2014 04:59:07 +0000
treeherdermozilla-central@e743fd8c57ed [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersRyanVM
bugs1041370
milestone33.0a1
first release with
nightly linux32
e743fd8c57ed / 33.0a1 / 20140721030205 / files
nightly linux64
e743fd8c57ed / 33.0a1 / 20140721030205 / files
nightly mac
e743fd8c57ed / 33.0a1 / 20140721030205 / files
nightly win32
e743fd8c57ed / 33.0a1 / 20140721030205 / files
nightly win64
e743fd8c57ed / 33.0a1 / 20140721030205 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1041370 - Fix script entry hook #ifdefing (a=RyanVM)
js/src/vm/Runtime.cpp
js/src/vm/Runtime.h
--- a/js/src/vm/Runtime.cpp
+++ b/js/src/vm/Runtime.cpp
@@ -176,17 +176,19 @@ JSRuntime::JSRuntime(JSRuntime *parentRu
 #if defined(JS_ARM_SIMULATOR) || defined(JS_MIPS_SIMULATOR)
     simulatorRuntime_(nullptr),
 #endif
     scriptAndCountsVector(nullptr),
     NaNValue(DoubleNaNValue()),
     negativeInfinityValue(DoubleValue(NegativeInfinity<double>())),
     positiveInfinityValue(DoubleValue(PositiveInfinity<double>())),
     emptyString(nullptr),
+#ifdef NIGHTLY_BUILD
     assertOnScriptEntryHook_(nullptr),
+#endif
     debugMode(false),
     spsProfiler(thisFromCtor()),
     profilingScripts(false),
     hadOutOfMemory(false),
     haveCreatedContext(false),
     data(nullptr),
     signalHandlersInstalled_(false),
     canUseSignalHandlers_(false),
--- a/js/src/vm/Runtime.h
+++ b/js/src/vm/Runtime.h
@@ -1031,17 +1031,19 @@ struct JSRuntime : public JS::shadow::Ru
     mozilla::LinkedList<JSContext> contextList;
 
     bool hasContexts() const {
         return !contextList.isEmpty();
     }
 
     mozilla::UniquePtr<js::SourceHook> sourceHook;
 
+#ifdef NIGHTLY_BUILD
     js::AssertOnScriptEntryHook assertOnScriptEntryHook_;
+#endif
 
     /* Per runtime debug hooks -- see js/OldDebugAPI.h. */
     JSDebugHooks        debugHooks;
 
     /* If true, new compartments are initially in debug mode. */
     bool                debugMode;
 
     /* SPS profiling metadata */