commit 6a7fdeffa49b5c52c8d3aadd09838eb028aa16ef
author Mike Klein <mtklein@google.com> Wed Jul 02 14:37:29 2014 -0400
committer Mike Klein <mtklein@google.com> Wed Jul 02 14:37:29 2014 -0400
tree e1b238a696256dbe374c39f25150e21e52d0d444
parent 5c76a0f1d1a848368d419864bad8ba8c59d56c74

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

src/opts/SkBlitRow_opts_SSE4.h

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);