[msan] Really disable replacement new and delete.

llvm-svn: 179522

diff --git a/compiler-rt/lib/msan/msan_new_delete.cc b/compiler-rt/lib/msan/msan_new_delete.cc
index c4efe2e..88d4364 100644 (file)
--- a/compiler-rt/lib/msan/msan_new_delete.cc
+++ b/compiler-rt/lib/msan/msan_new_delete.cc
@@ -14,6 +14,8 @@
 
 #include "msan.h"
 
+#if MSAN_REPLACE_OPERATORS_NEW_AND_DELETE
+
 #include <stddef.h>
 
 namespace __msan {
@@ -49,3 +51,5 @@ void operator delete(void *ptr, std::nothrow_t const&) { OPERATOR_DELETE_BODY; }
 void operator delete[](void *ptr, std::nothrow_t const&) {
   OPERATOR_DELETE_BODY;
 }
+
+#endif // MSAN_REPLACE_OPERATORS_NEW_AND_DELETE