Fix conditionally enabling Reactor MSan instrumentation

The LLVM MemorySanitizer pass was added for -fsanitizer=memory builds when REACTOR_ENABLE_MEMORY_SANITIZER_INSTRUMENTATION is defined, but LLVMJIT.cpp includes LLVMReactor.hpp, which in turn includes Reactor.hpp which defines REACTOR_ENABLE_MEMORY_SANITIZER_INSTRUMENTATION to 0 if not previously defined, which will always enable it. Use #if instead of #ifdef to conditionally enable instrumentation based on REACTOR_ENABLE_MEMORY_SANITIZER_INSTRUMENTATION's value. Bug: b/155148722 Change-Id: I337832d942fcc576afac4d0c1d89c9fa42974cbe Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/50288 Presubmit-Ready: Nicolas Capens <nicolascapens@google.com> Tested-by: Nicolas Capens <nicolascapens@google.com> Kokoro-Result: kokoro <noreply+kokoro@google.com> Reviewed-by: Antonio Maiorano <amaiorano@google.com>

Fix conditionally enabling Reactor MSan instrumentation
1a8935a4 · Nicolas Capens · Nicolas Capens · 4804ac87 · 1a8935a4
Commit 1a8935a4 authored Nov 12, 2020 by Nicolas Capens Committed by Nicolas Capens Nov 12, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

LLVMJIT.cpp src/Reactor/LLVMJIT.cpp +1 -1

No files found.
--- a/src/Reactor/LLVMJIT.cpp
+++ b/src/Reactor/LLVMJIT.cpp
@@ -724,7 +724,7 @@ void JITBuilder::optimize(const rr::Config &cfg)

 	llvm::legacy::PassManager passManager;

-#ifdef REACTOR_ENABLE_MEMORY_SANITIZER_INSTRUMENTATION
+#if REACTOR_ENABLE_MEMORY_SANITIZER_INSTRUMENTATION
 	if(__has_feature(memory_sanitizer))
 	{
 		passManager.add(llvm::createMemorySanitizerLegacyPassPass());