Bug 1474904 - Enable memory protection exception handler on dev-edition builds. r=ehoogeveen
authorNicolas B. Pierron <nicolas.b.pierron@gmail.com>
Wed, 11 Jul 2018 17:30:04 +0000
changeset 426371 21f8f4c25486be1159fa051f90de9bd473d8529d
parent 426370 de4058a2b443997db87908e24c807197ee8bbbfa
child 426372 5654b62b0b11a68bc40c91a1e9764f6ef504563b
push id34271
push userapavel@mozilla.com
push dateThu, 12 Jul 2018 21:52:15 +0000
treeherdermozilla-central@96c61b1dd0a1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehoogeveen
bugs1474904
milestone63.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 1474904 - Enable memory protection exception handler on dev-edition builds. r=ehoogeveen
js/src/ds/MemoryProtectionExceptionHandler.cpp
--- a/js/src/ds/MemoryProtectionExceptionHandler.cpp
+++ b/js/src/ds/MemoryProtectionExceptionHandler.cpp
@@ -113,17 +113,17 @@ MemoryProtectionExceptionHandler::isDisa
 #if defined(XP_WIN) && defined(MOZ_ASAN)
     // Under Windows ASan, WasmFaultHandler registers itself at 'last' priority
     // in order to let ASan's ShadowExceptionHandler stay at 'first' priority.
     // Unfortunately that results in spurious wasm faults passing through the
     // MemoryProtectionExceptionHandler, which breaks its assumption that any
     // faults it sees are fatal. Just disable this handler in that case, as the
     // crash annotations provided here are not critical for ASan builds.
     return true;
-#elif defined(RELEASE_OR_BETA)
+#elif !defined(MOZ_DIAGNOSTIC_ASSERT_ENABLED)
     // Disable the exception handler for Beta and Release builds.
     return true;
 #else
     return false;
 #endif
 }
 
 void