Disable assembly code in MemorySanitizer builds. MemorySanitizer is an unitialized memory use detector which is used in Chromium, and does not presently support assembly code. BUG=chromium:344505, chromium:373739 R=mtklein@google.com Review URL: https://codereview.chromium.org/367973005
diff --git a/src/opts/SkBlitRow_opts_SSE4.h b/src/opts/SkBlitRow_opts_SSE4.h index 6c6276e..c49c392 100644 --- a/src/opts/SkBlitRow_opts_SSE4.h +++ b/src/opts/SkBlitRow_opts_SSE4.h
@@ -12,8 +12,10 @@ /* Check if we are able to build assembly code, GCC/AT&T syntax. * Had problems with LLVM-GCC 4.2. + * MemorySanitizer cannot handle assembly code. */ -#if defined(__clang__) || (defined(__GNUC__) && !defined(SK_BUILD_FOR_MAC)) +#if (defined(__clang__) || (defined(__GNUC__) && !defined(SK_BUILD_FOR_MAC))) \ + && !defined(MEMORY_SANITIZER) extern "C" void S32A_Opaque_BlitRow32_SSE4_asm(SkPMColor* SK_RESTRICT dst, const SkPMColor* SK_RESTRICT src, int count, U8CPU alpha);