Bug 1036235 - Do not use __asan_default_options with clang-cl because it is not supported yet; r=decoder

This commit is contained in:
Ehsan Akhgari 2014-07-09 15:16:55 -04:00
parent 9ff5212b89
commit 22b05d25b2
2 changed files with 6 additions and 1 deletions

View File

@ -1056,7 +1056,8 @@ js::RequestInterruptForAsmJSCode(JSRuntime *rt, int interruptModeRaw)
activation->module().protectCode(rt); activation->module().protectCode(rt);
} }
#if defined(MOZ_ASAN) && defined(JS_STANDALONE) // This is not supported by clang-cl yet.
#if defined(MOZ_ASAN) && defined(JS_STANDALONE) && !defined(_MSC_VER)
// Usually, this definition is found in mozglue (see mozglue/build/AsanOptions.cpp). // 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 // 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. // that we still allow custom SIGSEGV handlers for asm.js and ion to work correctly.

View File

@ -5,6 +5,8 @@
#include "mozilla/Attributes.h" #include "mozilla/Attributes.h"
#ifndef _MSC_VER // Not supported by clang-cl yet
// When running with AddressSanitizer, we need to explicitely set some // When running with AddressSanitizer, we need to explicitely set some
// options specific to our codebase to prevent errors during runtime. // options specific to our codebase to prevent errors during runtime.
// //
@ -22,3 +24,5 @@ extern "C" MOZ_ASAN_BLACKLIST
const char* __asan_default_options() { const char* __asan_default_options() {
return "allow_user_segv_handler=1:alloc_dealloc_mismatch=0"; return "allow_user_segv_handler=1:alloc_dealloc_mismatch=0";
} }
#endif