From a81fee275fbf5e009351b36edc3582f5121319f1 Mon Sep 17 00:00:00 2001
From: Jan Vorlicek <jan.vorlicek@volny.cz>
Date: Thu, 22 Jul 2021 23:39:42 +0200
Subject: [PATCH] Fix DAC issue with redefined standard new / delete operators
 (#55945)

I have found that since .NET 6 preview 5, SOS on macOS arm64 crashes
when running basic commands like clrstack due to the fact that
its std::string allocations are done using standard new operator,
but the freeing at some places is done using our overriden delete
operator due to inlining of STL code.

This change removes our redefinitions of those operators for DAC
compilation, so this clash cannot happen.
---
 src/coreclr/utilcode/clrhost_nodependencies.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/coreclr/utilcode/clrhost_nodependencies.cpp b/src/coreclr/utilcode/clrhost_nodependencies.cpp
index 64185df41cbb4..14e7fe4291ffc 100644
--- a/src/coreclr/utilcode/clrhost_nodependencies.cpp
+++ b/src/coreclr/utilcode/clrhost_nodependencies.cpp
@@ -215,7 +215,7 @@ ClrDebugState *CLRInitDebugState()
 
 const NoThrow nothrow = { 0 };
 
-#ifdef HAS_ADDRESS_SANITIZER
+#if defined(HAS_ADDRESS_SANITIZER) || defined(DACCESS_COMPILE)
 // use standard heap functions for address santizier
 #else
 
@@ -345,11 +345,11 @@ operator new[](size_t n)
     return result;
 };
 
-#endif // HAS_ADDRESS_SANITIZER
+#endif // HAS_ADDRESS_SANITIZER || DACCESS_COMPILE
 
 void * __cdecl operator new(size_t n, const NoThrow&) NOEXCEPT
 {
-#ifdef HAS_ADDRESS_SANITIZER
+#if defined(HAS_ADDRESS_SANITIZER) || defined(DACCESS_COMPILE)
     // use standard heap functions for address santizier (which doesn't provide for NoThrow)
 	void * result = operator new(n);
 #else
@@ -361,14 +361,14 @@ void * __cdecl operator new(size_t n, const NoThrow&) NOEXCEPT
     INCONTRACT(_ASSERTE(!ARE_FAULTS_FORBIDDEN()));
 
     void* result = ClrMalloc(n);
-#endif // HAS_ADDRESS_SANITIZER
+#endif // HAS_ADDRESS_SANITIZER || DACCESS_COMPILE
 	TRASH_LASTERROR;
     return result;
 }
 
 void * __cdecl operator new[](size_t n, const NoThrow&) NOEXCEPT
 {
-#ifdef HAS_ADDRESS_SANITIZER
+#if defined(HAS_ADDRESS_SANITIZER) || defined(DACCESS_COMPILE)
     // use standard heap functions for address santizier (which doesn't provide for NoThrow)
 	void * result = operator new[](n);
 #else
@@ -380,12 +380,12 @@ void * __cdecl operator new[](size_t n, const NoThrow&) NOEXCEPT
     INCONTRACT(_ASSERTE(!ARE_FAULTS_FORBIDDEN()));
 
     void* result = ClrMalloc(n);
-#endif // HAS_ADDRESS_SANITIZER
+#endif // HAS_ADDRESS_SANITIZER || DACCESS_COMPILE
 	TRASH_LASTERROR;
     return result;
 }
 
-#ifdef HAS_ADDRESS_SANITIZER
+#if defined(HAS_ADDRESS_SANITIZER) || defined(DACCESS_COMPILE)
 // use standard heap functions for address santizier
 #else
 void __cdecl
@@ -411,7 +411,7 @@ operator delete[](void *p) NOEXCEPT
     TRASH_LASTERROR;
 }
 
-#endif // HAS_ADDRESS_SANITIZER
+#endif // HAS_ADDRESS_SANITIZER || DACCESS_COMPILE
 
 /* ------------------------------------------------------------------------ *
  * New operator overloading for the executable heap