Use alternative mechanisms to allow us to use the default new/delete …

…implementations (#101947)
dotnet · May 17, 2024 · 4246ba1 · 4246ba1
1 parent 84885d7
commit 4246ba1
Show file tree

Hide file tree

Showing 21 changed files with 75 additions and 214 deletions.
diff --git a/src/coreclr/clrdefinitions.cmake b/src/coreclr/clrdefinitions.cmake
@@ -42,7 +42,6 @@ if(CLR_CMAKE_TARGET_LINUX_MUSL)
   add_definitions(-DNO_FIXED_STACK_LIMIT)
 endif(CLR_CMAKE_TARGET_LINUX_MUSL)
 
-add_definitions(-D_BLD_CLR)
 add_definitions(-DDEBUGGING_SUPPORTED)
 add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:DAC_COMPONENT>>>:PROFILING_SUPPORTED>)
 add_compile_definitions($<$<BOOL:$<TARGET_PROPERTY:DAC_COMPONENT>>:PROFILING_SUPPORTED_DATA>)

diff --git a/src/coreclr/debug/inc/dbgipcevents.h b/src/coreclr/debug/inc/dbgipcevents.h
@@ -10,7 +10,7 @@
 #ifndef _DbgIPCEvents_h_
 #define _DbgIPCEvents_h_
 
-#include <new.hpp>
+#include <new>
 #include <cor.h>
 #include <cordebug.h>
 #include <corjit.h> // for ICorDebugInfo::VarLocType & VarLoc
@@ -25,6 +25,8 @@
 
 #include "./common.h"
 
+using std::nothrow;
+
 //-----------------------------------------------------------------------------
 // V3 additions to IPC protocol between LS and RS.
 //-----------------------------------------------------------------------------

diff --git a/src/coreclr/ilasm/main.cpp b/src/coreclr/ilasm/main.cpp
@@ -151,11 +151,6 @@ extern "C" int _cdecl wmain(int argc, _In_ WCHAR **argv)
     memset(wzOutputFilename,0,sizeof(wzOutputFilename));
     memset(wzPdbFilename, 0, sizeof(wzPdbFilename));
 
-#ifdef _DEBUG
-    DisableThrowCheck();
-    //CONTRACT_VIOLATION(ThrowsViolation);
-#endif
-
     if(argc < 2) goto ErrorExit;
 #ifdef _PREFAST_
 #pragma warning(push)

diff --git a/src/coreclr/ildasm/windasm.cpp b/src/coreclr/ildasm/windasm.cpp
@@ -17,7 +17,9 @@
 #include <clrversion.h>
 #include "resource.h"
 
-#include "new.hpp"
+#include <new>
+
+using std::nothrow;
 
 #define MODE_DUMP_ALL               0
 #define MODE_DUMP_CLASS             1
@@ -465,10 +467,6 @@ int main(int argc, char* argv[])
     }
 #endif
 
-#ifdef _DEBUG
-    DisableThrowCheck();
-#endif
-
     int     iCommandLineParsed = 0;
     WCHAR*  wzCommandLine = NULL;
     char*   szCommandLine = NULL;

diff --git a/src/coreclr/inc/clrhost.h b/src/coreclr/inc/clrhost.h
@@ -8,6 +8,8 @@
 #ifndef __CLRHOST_H__
 #define __CLRHOST_H__
 
+#include <new>
+
 #include "windows.h" // worth to include before mscoree.h so we are guaranteed to pick few definitions
 #ifdef CreateSemaphore
 #undef CreateSemaphore
@@ -16,7 +18,9 @@
 #include "clrinternal.h"
 #include "switches.h"
 #include "holder.h"
-#include "new.hpp"
+
+using std::nothrow;
+
 #include "staticcontract.h"
 #include "predeftlsslot.h"
 #include "safemath.h"

diff --git a/src/coreclr/inc/corhlpr.cpp b/src/coreclr/inc/corhlpr.cpp
@@ -8,9 +8,7 @@
  ****************************************************************************/
 #ifndef SOS_INCLUDE
 
-#ifdef _BLD_CLR
 #include "utilcode.h"
-#endif
 #include "corhlpr.h"
 #include <stdlib.h>
 

diff --git a/src/coreclr/inc/corhlpr.h b/src/coreclr/inc/corhlpr.h
@@ -22,14 +22,9 @@
 #include "corhdr.h"
 #include "corerror.h"
 #include "unreachable.h"
+#include <new>
 
-// This header is consumed both within the runtime and externally. In the former
-// case we need to wrap memory allocations, in the latter there is no
-// infrastructure to support this. Detect which way we're building and provide a
-// very simple abstraction layer (handles allocating bytes only).
-#ifdef _BLD_CLR
-#include "new.hpp"
-
+using std::nothrow;
 
 #define NEW_NOTHROW(_bytes) new (nothrow) BYTE[_bytes]
 #define NEW_THROWS(_bytes) new BYTE[_bytes]
@@ -38,27 +33,6 @@ inline void DECLSPEC_NORETURN THROW_OUT_OF_MEMORY()
 {
     ThrowOutOfMemory();
 }
-#else
-#define NEW_NOTHROW(_bytes) new BYTE[_bytes]
-#define NEW_THROWS(_bytes) __CorHlprNewThrows(_bytes)
-static inline void DECLSPEC_NORETURN __CorHlprThrowOOM()
-{
-    RaiseException(STATUS_NO_MEMORY, 0, 0, NULL);
-    __UNREACHABLE();
-}
-static inline BYTE *__CorHlprNewThrows(size_t bytes)
-{
-    BYTE *pbMemory = new BYTE[bytes];
-    if (pbMemory == NULL)
-        __CorHlprThrowOOM();
-    return pbMemory;
-}
-inline void DECLSPEC_NORETURN THROW_OUT_OF_MEMORY()
-{
-    __CorHlprThrowOOM();
-}
-#endif
-
 
 //*****************************************************************************
 // There are a set of macros commonly used in the helpers which you will want

diff --git a/src/coreclr/inc/corhlprpriv.cpp b/src/coreclr/inc/corhlprpriv.cpp
@@ -8,9 +8,7 @@
  ****************************************************************************/
 #ifndef SOS_INCLUDE
 
-#ifdef _BLD_CLR
 #include "utilcode.h"
-#endif
 #include "corhlprpriv.h"
 #include <stdlib.h>
 
@@ -23,7 +21,6 @@
 template <SIZE_T SIZE, SIZE_T INCREMENT>
 HRESULT CQuickMemoryBase<SIZE, INCREMENT>::ReSizeNoThrow(SIZE_T iItems)
 {
-#ifdef _BLD_CLR
 #ifdef _DEBUG
 #ifndef DACCESS_COMPILE
     // Exercise heap for OOM-fault injection purposes
@@ -38,7 +35,6 @@ HRESULT CQuickMemoryBase<SIZE, INCREMENT>::ReSizeNoThrow(SIZE_T iItems)
         delete [] pTmp;
     }
 #endif
-#endif
 #endif
     BYTE *pbBuffNew;
     if (iItems <= cbTotal)
@@ -47,12 +43,10 @@ HRESULT CQuickMemoryBase<SIZE, INCREMENT>::ReSizeNoThrow(SIZE_T iItems)
         return NOERROR;
     }
 
-#ifdef _BLD_CLR
 #ifndef DACCESS_COMPILE
     // not allowed to do allocation if current thread suspends EE
     if (IsSuspendEEThread ())
         return E_OUTOFMEMORY;
-#endif
 #endif
     pbBuffNew = NEW_NOTHROW(iItems + INCREMENT);
     if (!pbBuffNew)

diff --git a/src/coreclr/inc/corhlprpriv.h b/src/coreclr/inc/corhlprpriv.h
@@ -81,7 +81,7 @@ class CQuickMemoryBase
     template <BOOL bGrow, BOOL bThrow>
     void *_Alloc(SIZE_T iItems)
     {
-#if defined(_BLD_CLR) && defined(_DEBUG)
+#if defined(_DEBUG)
         {  // Exercise heap for OOM-fault injection purposes
             BYTE * pb = NSQuickBytesHelper::_AllocBytes<bThrow>::Invoke(iItems);
             _ASSERTE(!bThrow || pb != NULL); // _AllocBytes would have thrown if bThrow == TRUE

diff --git a/src/coreclr/inc/ex.h b/src/coreclr/inc/ex.h
@@ -827,6 +827,15 @@ Exception *ExThrowWithInnerHelper(Exception *inner);
                 }                                                                       \
                 SCAN_EHMARKER_END_TRY();                                                \
             }                                                                           \
+            PAL_CPP_CATCH_NON_DERIVED_NOARG (const std::bad_alloc&)                     \
+            {                                                                           \
+                SCAN_EHMARKER_CATCH();                                                  \
+                __state.SetCaughtCxx();                                                 \
+                __state.m_pExceptionPtr = Exception::GetOOMException();                 \
+                SCAN_EHMARKER_END_CATCH();                                              \
+                SCAN_IGNORE_THROW_MARKER;                                               \
+                ThrowOutOfMemory();                                                     \
+            }                                                                           \
             PAL_CPP_CATCH_DERIVED (DerivedExceptionClass, __pExceptionRaw)              \
             {                                                                           \
                 SCAN_EHMARKER_CATCH();                                                  \
@@ -862,18 +871,34 @@ Exception *ExThrowWithInnerHelper(Exception *inner);
         PAL_CPP_TRY                                                                 \
         {                                                                           \
             SCAN_EHMARKER_TRY();                                                    \
-            CAutoTryCleanup<STATETYPE> __autoCleanupTry(__state);                   \
-            /* prevent annotations from being dropped by optimizations in debug */  \
-            INDEBUG(static bool __alwayszero;)                                      \
-            INDEBUG(VolatileLoad(&__alwayszero);)                                   \
+            SCAN_EHMARKER();                                                        \
+            PAL_CPP_TRY                                                             \
             {                                                                       \
-                /* Disallow returns to make exception handling work. */             \
-                /* Some work is done after the catch, see EX_ENDTRY. */             \
-                DEBUG_ASSURE_NO_RETURN_BEGIN(EX_TRY)                                \
+                SCAN_EHMARKER_TRY();                                                \
+                CAutoTryCleanup<STATETYPE> __autoCleanupTry(__state);               \
+                /* prevent annotations from being dropped by optimizations in debug */ \
+                INDEBUG(static bool __alwayszero;)                                  \
+                INDEBUG(VolatileLoad(&__alwayszero);)                               \
+                {                                                                   \
+                    /* Disallow returns to make exception handling work. */         \
+                   /* Some work is done after the catch, see EX_ENDTRY. */          \
+                    DEBUG_ASSURE_NO_RETURN_BEGIN(EX_TRY)                            \
 
 #define EX_CATCH_IMPL_CPP_ONLY                                                      \
-                DEBUG_ASSURE_NO_RETURN_END(EX_TRY)                                  \
+                    DEBUG_ASSURE_NO_RETURN_END(EX_TRY)                              \
+                }                                                                   \
+                SCAN_EHMARKER_END_TRY();                                            \
+            }                                                                       \
+            PAL_CPP_CATCH_NON_DERIVED_NOARG (const std::bad_alloc&)                 \
+            {                                                                       \
+                SCAN_EHMARKER_CATCH();                                              \
+                __state.SetCaughtCxx();                                             \
+                __state.m_pExceptionPtr = Exception::GetOOMException();             \
+                SCAN_EHMARKER_END_CATCH();                                          \
+                SCAN_IGNORE_THROW_MARKER;                                           \
+                ThrowOutOfMemory();                                                 \
             }                                                                       \
+            PAL_CPP_ENDTRY                                                          \
             SCAN_EHMARKER_END_TRY();                                                \
         }                                                                           \
         PAL_CPP_CATCH_DERIVED (Exception, __pExceptionRaw)                          \

diff --git a/src/coreclr/inc/new.hpp b/src/coreclr/inc/new.hpp
diff --git a/src/coreclr/inc/palclr.h b/src/coreclr/inc/palclr.h
@@ -481,6 +481,8 @@
 #define PAL_CPP_THROW(type, obj) do { SCAN_THROW_MARKER; throw obj; } while (false)
 #define PAL_CPP_RETHROW do { SCAN_THROW_MARKER; throw; } while (false)
 #define PAL_CPP_CATCH_DERIVED(type, obj) catch (type * obj)
+#define PAL_CPP_CATCH_NON_DERIVED(type, obj) catch (type obj)
+#define PAL_CPP_CATCH_NON_DERIVED_NOARG(type) catch (type)
 #define PAL_CPP_CATCH_ALL catch (...)
 #define PAL_CPP_CATCH_EXCEPTION_NOARG catch (Exception *)
 

diff --git a/src/coreclr/inc/utilcode.h b/src/coreclr/inc/utilcode.h
@@ -14,6 +14,9 @@
 #include <algorithm>
 #include <stdio.h>
 #include <limits.h>
+#include <new>
+
+using std::nothrow;
 
 #include "crtwrap.h"
 #include "winwrap.h"
@@ -29,7 +32,6 @@
 #include "corhlprpriv.h"
 #include "check.h"
 #include "safemath.h"
-#include "new.hpp"
 
 #include "contract.h"
 

diff --git a/src/coreclr/md/external.h b/src/coreclr/md/external.h
@@ -13,4 +13,6 @@
 
 #include <clrtypes.h>
 #include <safemath.h>
-#include <new.hpp>
+#include <new>
+
+using std::nothrow;
diff --git a/src/coreclr/pal/inc/pal.h b/src/coreclr/pal/inc/pal.h
@@ -4418,6 +4418,8 @@ class NativeExceptionHolderFactory
 #define PAL_CPP_CATCH_EXCEPTION(ident)  } catch (Exception *ident) {
 #define PAL_CPP_CATCH_EXCEPTION_NOARG   } catch (Exception *) {
 #define PAL_CPP_CATCH_DERIVED(type, ident) } catch (type *ident) {
+#define PAL_CPP_CATCH_NON_DERIVED(type, ident) } catch (type ident) {
+#define PAL_CPP_CATCH_NON_DERIVED_NOARG(type) } catch (type) {
 #define PAL_CPP_CATCH_ALL               } catch (...) {                                           \
                                             try { throw; }                                        \
                                             catch (PAL_SEHException& ex) { ex.SecondPassDone(); } \