Backed out changeset d1b9fbbc9710 (bug 1314169) for jit failures a=backout
authorWes Kocher <wkocher@mozilla.com>
Thu, 10 Nov 2016 16:14:14 -0800
changeset 322145 b3e1adfb080cb65f63433325a55f1ac732383fbd
parent 322144 6deb8408930c0d03abf45cc87a57dfa1277e7d6f
child 322146 e33f5dd90abe0fee15f6eeadc934dfaee043de5f
push id21
push usermaklebus@msu.edu
push dateThu, 01 Dec 2016 06:22:08 +0000
reviewersbackout
bugs1314169
milestone52.0a1
backs outd1b9fbbc9710402f0b0da8025819534bb98c9321
Backed out changeset d1b9fbbc9710 (bug 1314169) for jit failures a=backout
js/src/wasm/WasmSignalHandlers.cpp
--- a/js/src/wasm/WasmSignalHandlers.cpp
+++ b/js/src/wasm/WasmSignalHandlers.cpp
@@ -1335,18 +1335,17 @@ ProcessHasSignalHandlers()
     {
         MOZ_CRASH("contention for interrupt signal");
     }
 #endif // defined(XP_WIN)
 
     // Install a SIGSEGV handler to handle safely-out-of-bounds asm.js heap
     // access and/or unaligned accesses.
 # if defined(XP_WIN)
-    // FirstHandler must be false to avoid a conflict with ASan's fault handler
-    if (!AddVectoredExceptionHandler(/* FirstHandler = */ false, WasmFaultHandler))
+    if (!AddVectoredExceptionHandler(/* FirstHandler = */ true, WasmFaultHandler))
         return false;
 # elif defined(XP_DARWIN)
     // OSX handles seg faults via the Mach exception handler above, so don't
     // install WasmFaultHandler.
 # else
     // SA_NODEFER allows us to reenter the signal handler if we crash while
     // handling the signal, and fall through to the Breakpad handler by testing
     // handlingSegFault.