Only lower MSan codegen optimization for LLVM JIT

src/Reactor/LLVMJIT.cpp

@@ -198,6 +198,14 @@ JITGlobals::JITGlobals(llvm::orc::JITTargetMachineBuilder &&jitTargetMachineBuil
 
 llvm::CodeGenOpt::Level JITGlobals::toLLVM(rr::Optimization::Level level)
 {
+	// TODO(b/173257647): MemorySanitizer instrumentation produces IR which takes
+	// a lot longer to process by the machine code optimization passes. Disabling
+	// them has a negligible effect on code quality but compiles much faster.
+	if(__has_feature(memory_sanitizer))
+	{
+		return llvm::CodeGenOpt::None;
+	}
+
 	switch(level)
 	{
 		case rr::Optimization::Level::None: return llvm::CodeGenOpt::None;
@@ -206,6 +214,7 @@ llvm::CodeGenOpt::Level JITGlobals::toLLVM(rr::Optimization::Level level)
 		case rr::Optimization::Level::Aggressive: return llvm::CodeGenOpt::Aggressive;
 		default: UNREACHABLE("Unknown Optimization Level %d", int(level));
 	}
+
 	return llvm::CodeGenOpt::Default;
 }
 

src/Reactor/Nucleus.hpp

@@ -28,12 +28,6 @@
 #	undef None  // TODO(b/127920555)
 #endif
 
-// A Clang extension to determine compiler features.
-// We use it to detect Sanitizer builds (e.g. -fsanitize=memory).
-#ifndef __has_feature
-#	define __has_feature(x) 0
-#endif
-
 static_assert(sizeof(short) == 2, "Reactor's 'Short' type is 16-bit, and requires the C++ 'short' to match that.");
 static_assert(sizeof(int) == 4, "Reactor's 'Int' type is 32-bit, and requires the C++ 'int' to match that.");
 
@@ -85,14 +79,6 @@ public:
 			this->level = Level::REACTOR_DEFAULT_OPT_LEVEL;
 		}
 #endif
-
-		// TODO(b/173257647): MemorySanitizer instrumentation produces IR which takes
-		// a lot longer to process by the machine code optimization passes. Disabling
-		// them has a negligible effect on code quality but compiles much faster.
-		if(__has_feature(memory_sanitizer))
-		{
-			this->level = Level::None;
-		}
 	}
 
 	Level getLevel() const { return level; }

src/Reactor/Reactor.hpp

@@ -52,6 +52,12 @@ int DebugPrintf(const char *format, ...);
 }
 #endif
 
+// A Clang extension to determine compiler features.
+// We use it to detect Sanitizer builds (e.g. -fsanitize=memory).
+#ifndef __has_feature
+#	define __has_feature(x) 0
+#endif
+
 // Whether Reactor routine instrumentation is enabled for MSan builds.
 // TODO(b/155148722): Remove when unconditionally instrumenting for all build systems.
 #if !defined REACTOR_ENABLE_MEMORY_SANITIZER_INSTRUMENTATION