Bug 914174 - Fix nit in previous ASan patch. r=luke
☠☠ backed out by 4e8db3422a37 ☠ ☠
authorChristian Holler <choller@mozilla.com>
Tue, 10 Sep 2013 17:27:56 +0200
changeset 146425 1a413186fb491eaf4de542356d10f45266cb7b29
parent 146424 0f7c370491bf44c2434049972ac28010d5c0a4ed
child 146426 69e2cfaac25eb1a174ffa5807eadab976e91d102
push id25260
push userryanvm@gmail.com
push dateWed, 11 Sep 2013 00:29:30 +0000
treeherdermozilla-central@f73bed2856a8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersluke
bugs914174
milestone26.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 914174 - Fix nit in previous ASan patch. r=luke
js/src/jit/AsmJSSignalHandlers.cpp
--- a/js/src/jit/AsmJSSignalHandlers.cpp
+++ b/js/src/jit/AsmJSSignalHandlers.cpp
@@ -1029,19 +1029,17 @@ js::TriggerOperationCallbackForAsmJSCode
     if (!VirtualProtect(module.functionCode(), module.functionBytes(), PAGE_NOACCESS, &oldProtect))
         MOZ_CRASH();
 #else  // assume Unix
     if (mprotect(module.functionCode(), module.functionBytes(), PROT_NONE))
         MOZ_CRASH();
 #endif
 }
 
-#ifdef MOZ_ASAN
-#ifdef JS_STANDALONE
+#if defined(MOZ_ASAN) && defined(JS_STANDALONE)
 // Usually, this definition is found in mozglue (see mozglue/build/AsanOptions.cpp).
 // However, when doing standalone JS builds, mozglue is not used and we must ensure
 // that we still allow custom SIGSEGV handlers for asm.js and ion to work correctly.
 extern "C" MOZ_ASAN_BLACKLIST
 const char* __asan_default_options() {
     return "allow_user_segv_handler=1";
 }
 #endif
-#endif