commit e4c1a25cc6797a47043fc415c53b8edcd7b3e37e
author Nicolas Capens <capn@google.com> Thu Nov 12 14:13:48 2020 -0500
committer Nicolas Capens <nicolascapens@google.com> Fri Nov 13 01:30:03 2020 +0000
tree 9a476faf2e0f111179f3acb9f8ca31ec1da88aeb
parent fd0d0441ca1e60bfe197b976662fa6342202ac25

Use LLVM JIT for MemorySanitizer GN builds

Only the LLVM JIT supports MemorySanitizer instrumentation, so don't use
Subzero for MSan builds.

Bug: b/155148722
Change-Id: I286107b08f36bc1083568353361cfca5947dd4d7
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/50308
Reviewed-by: Alexis Hétu <sugoi@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>

src/Reactor/BUILD.gn

diff --git a/src/Reactor/BUILD.gn b/src/Reactor/BUILD.gn
index a2724bb..86bfabf 100644
--- a/src/Reactor/BUILD.gn
+++ b/src/Reactor/BUILD.gn
@@ -16,9 +16,9 @@
 
 declare_args() {
   # Subzero produces smaller binaries, but doesn't support ARM64, MIPS64, and
-  # PPC64.
+  # PPC64. It also doesn't support MemorySanitizer instrumentation.
   use_swiftshader_with_subzero =
-      current_cpu != "arm64" && current_cpu != "mips64el" && current_cpu != "ppc64"
+      current_cpu != "arm64" && current_cpu != "mips64el" && current_cpu != "ppc64" && !is_msan
   supports_llvm = is_linux || is_chromeos || is_fuchsia || is_win || is_android || is_mac
 }