summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/msan/msan.cc2
-rw-r--r--lib/msan/msan.h1
-rw-r--r--lib/msan/msan_new_delete.cc7
3 files changed, 0 insertions, 10 deletions
diff --git a/lib/msan/msan.cc b/lib/msan/msan.cc
index caa77366c..87a909755 100644
--- a/lib/msan/msan.cc
+++ b/lib/msan/msan.cc
@@ -360,8 +360,6 @@ void __msan_init() {
InitializeInterceptors();
InstallAtExitHandler(); // Needs __cxa_atexit interceptor.
- if (MSAN_REPLACE_OPERATORS_NEW_AND_DELETE)
- ReplaceOperatorsNewAndDelete();
DisableCoreDumperIfNecessary();
if (StackSizeIsUnlimited()) {
VPrintf(1, "Unlimited stack, doing reexec\n");
diff --git a/lib/msan/msan.h b/lib/msan/msan.h
index ed18f21d0..f5f87dd0a 100644
--- a/lib/msan/msan.h
+++ b/lib/msan/msan.h
@@ -131,7 +131,6 @@ void *MsanReallocate(StackTrace *stack, void *oldp, uptr size,
void MsanDeallocate(StackTrace *stack, void *ptr);
void InstallTrapHandler();
void InstallAtExitHandler();
-void ReplaceOperatorsNewAndDelete();
const char *GetStackOriginDescr(u32 id, uptr *pc);
diff --git a/lib/msan/msan_new_delete.cc b/lib/msan/msan_new_delete.cc
index 9a8e56e4a..c8bc0651b 100644
--- a/lib/msan/msan_new_delete.cc
+++ b/lib/msan/msan_new_delete.cc
@@ -19,13 +19,6 @@
#include <stddef.h>
-namespace __msan {
-// This function is a no-op. We need it to make sure that object file
-// with our replacements will actually be loaded from static MSan
-// run-time library at link-time.
-void ReplaceOperatorsNewAndDelete() { }
-}
-
using namespace __msan; // NOLINT
// Fake std::nothrow_t to avoid including <new>.