Bug 1474904 - Enable memory protection exception handler on dev-edition builds. r=ehoogeveen a=lizzard
authorNicolas B. Pierron <nicolas.b.pierron@gmail.com>
Wed, 11 Jul 2018 17:30:04 +0000
changeset 477960 4c22770b36ca
parent 477959 0f8a467c6c83
child 477961 d7ab2f3df084
push id9475
push userarchaeopteryx@coole-files.de
push date2018-07-13 21:33 +0000
treeherdermozilla-beta@d7ab2f3df084 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehoogeveen, lizzard
bugs1474904
milestone62.0
Bug 1474904 - Enable memory protection exception handler on dev-edition builds. r=ehoogeveen a=lizzard
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