Backed out changeset d34efa945a20 (bug 1314169) for not fixing the bug. DONTBUILD
authorDavid Major <dmajor@mozilla.com>
Wed, 09 Nov 2016 13:50:28 -0600
changeset 351988 ea14d2a7c5dc3893ed6d42d94cbe36c45d7fd975
parent 351987 5cd3eebd3f3c4e47230ca1ee10c30f33c525bbc3
child 351989 2e21f3a89751b5bf85d8c10b983dfcc845452cf8
push id6795
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 14:19:46 +0000
treeherdermozilla-esr52@76101b503191 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1314169
milestone52.0a1
backs outd34efa945a2005cada2706318a44dbc804e7861b
Backed out changeset d34efa945a20 (bug 1314169) for not fixing the bug. DONTBUILD Doesn't affect any config that currently runs in CI.
js/src/wasm/WasmSignalHandlers.cpp
--- a/js/src/wasm/WasmSignalHandlers.cpp
+++ b/js/src/wasm/WasmSignalHandlers.cpp
@@ -772,17 +772,17 @@ IsHeapAccessAddress(const Instance &inst
 
     return instance.metadata().usesMemory() &&
            faultingAddress >= instance.memoryBase() &&
            faultingAddress < instance.memoryBase() + accessLimit;
 }
 
 #if defined(XP_WIN)
 
-MOZ_ASAN_BLACKLIST static bool
+static bool
 HandleFault(PEXCEPTION_POINTERS exception)
 {
     EXCEPTION_RECORD* record = exception->ExceptionRecord;
     CONTEXT* context = exception->ContextRecord;
 
     if (record->ExceptionCode != EXCEPTION_ACCESS_VIOLATION)
         return false;
 
@@ -826,17 +826,17 @@ HandleFault(PEXCEPTION_POINTERS exceptio
         return pc == instance->codeSegment().interruptCode() &&
                instance->codeSegment().containsFunctionPC(activation->resumePC());
     }
 
     HandleMemoryAccess(context, pc, faultingAddress, *instance, ppc);
     return true;
 }
 
-MOZ_ASAN_BLACKLIST static LONG WINAPI
+static LONG WINAPI
 WasmFaultHandler(LPEXCEPTION_POINTERS exception)
 {
     if (HandleFault(exception))
         return EXCEPTION_CONTINUE_EXECUTION;
 
     // No need to worry about calling other handlers, the OS does this for us.
     return EXCEPTION_CONTINUE_SEARCH;
 }