Remove malloc wrapper and simplify InternalNew

dotnet · jkoritzinsky · Apr 4, 2024 · Feb 12, 2024 · Feb 12, 2024 · Feb 12, 2024
commit c7e6dc376468ef6aedcbcd78c566bf496acaff61
diff --git a/src/coreclr/pal/src/debug/debug.cpp b/src/coreclr/pal/src/debug/debug.cpp
@@ -204,7 +204,7 @@ OutputDebugStringW(
     }
 
     /* strLen includes the null terminator */
-    if ((lpOutputStringA = (LPSTR) InternalMalloc((strLen * sizeof(CHAR)))) == NULL)
+    if ((lpOutputStringA = (LPSTR) malloc((strLen * sizeof(CHAR)))) == NULL)
     {
         ERROR("Insufficient memory available !\n");
         SetLastError(ERROR_NOT_ENOUGH_MEMORY);

diff --git a/src/coreclr/pal/src/file/file.cpp b/src/coreclr/pal/src/file/file.cpp
@@ -2881,7 +2881,7 @@ GetTempFileNameW(
         prefix_stringPS.CloseBuffer(prefix_size - 1);
     }
 
-    tempfile_name = (char*)InternalMalloc(MAX_LONGPATH);
+    tempfile_name = (char*)malloc(MAX_LONGPATH);
     if (tempfile_name == NULL)
     {
         pThread->SetLastError(ERROR_NOT_ENOUGH_MEMORY);

diff --git a/src/coreclr/pal/src/file/find.cpp b/src/coreclr/pal/src/file/find.cpp
@@ -138,7 +138,7 @@ FindFirstFileA(
         goto done;
     }
 
-    find_data = (find_obj *)InternalMalloc(sizeof(find_obj));
+    find_data = (find_obj *)malloc(sizeof(find_obj));
     if ( find_data == NULL )
     {
         ERROR("Unable to allocate memory for find_data\n");

diff --git a/src/coreclr/pal/src/handlemgr/handlemgr.cpp b/src/coreclr/pal/src/handlemgr/handlemgr.cpp
@@ -51,7 +51,7 @@ CSimpleHandleManager::Initialize(
        field, with the head in the global 'm_hiFreeListStart'. */
     m_dwTableSize = m_dwTableGrowthRate;
 
-    m_rghteHandleTable = reinterpret_cast<HANDLE_TABLE_ENTRY*>(InternalMalloc((m_dwTableSize * sizeof(HANDLE_TABLE_ENTRY))));
+    m_rghteHandleTable = reinterpret_cast<HANDLE_TABLE_ENTRY*>(malloc((m_dwTableSize * sizeof(HANDLE_TABLE_ENTRY))));
     if(NULL == m_rghteHandleTable)
     {
         ERROR("Unable to create initial handle table array");

diff --git a/src/coreclr/pal/src/include/pal/malloc.hpp b/src/coreclr/pal/src/include/pal/malloc.hpp
@@ -27,86 +27,24 @@ Module Name:
 #include <new>
 
 namespace CorUnix{
-    inline void *
-    InternalMalloc(
-        size_t szSize
-        )
+    // Define "new" style allocators (which allocate then call a constructor).
+    template<class T, class... Ts>
+    T* InternalNew(Ts... args)
     {
-        void *pvMem;
+        T* pMem = (T*)malloc(sizeof(T));
 
-        if (szSize == 0)
-        {
-            // malloc may return null for a requested size of zero bytes. Force a nonzero size to get a valid pointer.
-            szSize = 1;
-        }
-
-        pvMem = (void*)malloc(szSize);
-        return pvMem;
-    }
-
-    // Define common code for "new" style allocators below.
-#define INTERNAL_NEW_COMMON()                    \
-        T *pMem = (T*)InternalMalloc(sizeof(T)); \
-        if (pMem == NULL)                        \
+        if (pMem == NULL)
             return NULL;
 
-    // Define "new" style allocators (which allocate then call a constructor) for different numbers of
-    // constructor arguments. Added based on usage.
-
-    // Default constructor (0 args) case.
-    template<class T>
-    T* InternalNew()
-    {
-        INTERNAL_NEW_COMMON();
-        return new (pMem) T();
-    }
-
-    // 1 arg case.
-    template<class T, class A1>
-    T* InternalNew(A1 arg1)
-    {
-        INTERNAL_NEW_COMMON();
-        return new (pMem) T(arg1);
-    }
-
-    // 2 args case.
-    template<class T, class A1, class A2>
-    T* InternalNew(A1 arg1, A2 arg2)
-    {
-        INTERNAL_NEW_COMMON();
-        return new (pMem) T(arg1, arg2);
-    }
-
-    // 3 args case.
-    template<class T, class A1, class A2, class A3>
-    T* InternalNew(A1 arg1, A2 arg2, A3 arg3)
-    {
-        INTERNAL_NEW_COMMON();
-        return new (pMem) T(arg1, arg2, arg3);
-    }
-
-    // 4 args case.
-    template<class T, class A1, class A2, class A3, class A4>
-    T* InternalNew(A1 arg1, A2 arg2, A3 arg3, A4 arg4)
-    {
-        INTERNAL_NEW_COMMON();
-        return new (pMem) T(arg1, arg2, arg3, arg4);
-    }
-
-    // 5 args case.
-    template<class T, class A1, class A2, class A3, class A4, class A5>
-    T* InternalNew(A1 arg1, A2 arg2, A3 arg3, A4 arg4, A5 arg5)
-    {
-        INTERNAL_NEW_COMMON();
-        return new (pMem) T(arg1, arg2, arg3, arg4, arg5);
+        return new (pMem) T(args...);
     }
 
     template<class T> T* InternalNewArray(size_t cElements)
     {
         size_t cbSize = (cElements * sizeof(T)) + sizeof(size_t);
         T *pMem;
 
-        pMem = (T*)InternalMalloc(cbSize);
+        pMem = (T*)malloc(cbSize);
 
         if (pMem == NULL)
             return NULL;

diff --git a/src/coreclr/pal/src/init/pal.cpp b/src/coreclr/pal/src/init/pal.cpp
@@ -1170,7 +1170,7 @@ static LPWSTR INIT_FormatCommandLine (int argc, const char * const *argv)
         length+=3;
         length+=strlen(argv[i])*2;
     }
-    command_line = reinterpret_cast<LPSTR>(InternalMalloc(length));
+    command_line = reinterpret_cast<LPSTR>(malloc(length != 0 ? length : 1));
 
     if(!command_line)
     {
@@ -1222,7 +1222,7 @@ static LPWSTR INIT_FormatCommandLine (int argc, const char * const *argv)
         return nullptr;
     }
 
-    retval = reinterpret_cast<LPWSTR>(InternalMalloc((sizeof(WCHAR)*i)));
+    retval = reinterpret_cast<LPWSTR>(malloc((sizeof(WCHAR)*i)));
     if(retval == nullptr)
     {
         ERROR("can't allocate memory for Unicode command line!\n");
@@ -1278,7 +1278,7 @@ static LPWSTR INIT_GetCurrentEXEPath()
         return nullptr;
     }
 
-    return_value = reinterpret_cast<LPWSTR>(InternalMalloc((return_size*sizeof(WCHAR))));
+    return_value = reinterpret_cast<LPWSTR>(malloc((return_size*sizeof(WCHAR))));
     if (nullptr == return_value)
     {
         ERROR("Not enough memory to create full path\n");

diff --git a/src/coreclr/pal/src/loader/module.cpp b/src/coreclr/pal/src/loader/module.cpp
@@ -1548,7 +1548,7 @@ static MODSTRUCT *LOADAllocModule(NATIVE_LIBRARY_HANDLE dl_handle, LPCSTR name)
     LPWSTR wide_name;
 
     /* no match found : try to create a new module structure */
-    module = (MODSTRUCT *)InternalMalloc(sizeof(MODSTRUCT));
+    module = (MODSTRUCT *)malloc(sizeof(MODSTRUCT));
     if (nullptr == module)
     {
         ERROR("malloc() failed! errno is %d (%s)\n", errno, strerror(errno));
@@ -1805,11 +1805,11 @@ MODSTRUCT *LOADGetPalLibrary()
         if (g_szCoreCLRPath == nullptr)
         {
             size_t  cbszCoreCLRPath = strlen(info.dli_fname) + 1;
-            g_szCoreCLRPath = (char*) InternalMalloc(cbszCoreCLRPath);
+            g_szCoreCLRPath = (char*) malloc(cbszCoreCLRPath);
 
             if (g_szCoreCLRPath == nullptr)
             {
-                ERROR("LOADGetPalLibrary: InternalMalloc failed!");
+                ERROR("LOADGetPalLibrary: malloc failed!");
                 goto exit;
             }
 

diff --git a/src/coreclr/pal/src/map/map.cpp b/src/coreclr/pal/src/map/map.cpp
@@ -1129,7 +1129,7 @@ CorUnix::InternalMapViewOfFile(
         // the global list.
         //
 
-        PMAPPED_VIEW_LIST pNewView = (PMAPPED_VIEW_LIST)InternalMalloc(sizeof(*pNewView));
+        PMAPPED_VIEW_LIST pNewView = (PMAPPED_VIEW_LIST)malloc(sizeof(*pNewView));
         if (NULL != pNewView)
         {
             pNewView->lpAddress = pvBaseAddress;
@@ -1833,7 +1833,7 @@ static PMAPPED_VIEW_LIST FindSharedMappingReplacement(
                 /* The new desired mapping is fully contained in the
                    one just found: we can reuse this one */
 
-                pNewView = (PMAPPED_VIEW_LIST)InternalMalloc(sizeof(MAPPED_VIEW_LIST));
+                pNewView = (PMAPPED_VIEW_LIST)malloc(sizeof(MAPPED_VIEW_LIST));
                 if (pNewView)
                 {
                     memcpy(pNewView, pView, sizeof(*pNewView));
@@ -1868,7 +1868,7 @@ static NativeMapHolder * NewNativeMapHolder(CPalThread *pThread, LPVOID address,
     }
 
     pThisMapHolder =
-        (NativeMapHolder *)InternalMalloc(sizeof(NativeMapHolder));
+        (NativeMapHolder *)malloc(sizeof(NativeMapHolder));
 
     if (pThisMapHolder)
     {
@@ -1934,7 +1934,7 @@ MAPRecordMapping(
 
     PAL_ERROR palError = NO_ERROR;
     PMAPPED_VIEW_LIST pNewView;
-    pNewView = (PMAPPED_VIEW_LIST)InternalMalloc(sizeof(*pNewView));
+    pNewView = (PMAPPED_VIEW_LIST)malloc(sizeof(*pNewView));
     if (NULL != pNewView)
     {
         pNewView->lpAddress = addr;

diff --git a/src/coreclr/pal/src/map/virtual.cpp b/src/coreclr/pal/src/map/virtual.cpp
@@ -401,7 +401,7 @@ static BOOL VIRTUALStoreAllocationInfo(
         return FALSE;
     }
 
-    if (!(pNewEntry = (PCMI)InternalMalloc(sizeof(*pNewEntry))))
+    if (!(pNewEntry = (PCMI)malloc(sizeof(*pNewEntry))))
     {
         ERROR( "Unable to allocate memory for the structure.\n");
         return FALSE;

diff --git a/src/coreclr/pal/src/misc/strutil.cpp b/src/coreclr/pal/src/misc/strutil.cpp
@@ -53,7 +53,7 @@ CPalString::CopyString(
         _ASSERTE(psSource->GetMaxLength() > psSource->GetStringLength());
 
         WCHAR *pwsz = reinterpret_cast<WCHAR*>(
-            InternalMalloc(psSource->GetMaxLength() * sizeof(WCHAR))
+            malloc(psSource->GetMaxLength() * sizeof(WCHAR))
             );
 
         if (NULL != pwsz)

diff --git a/src/coreclr/pal/src/objmgr/palobjbase.cpp b/src/coreclr/pal/src/objmgr/palobjbase.cpp
@@ -58,7 +58,7 @@ CPalObjectBase::Initialize(
 
     if (0 != m_pot->GetImmutableDataSize())
     {
-        m_pvImmutableData = InternalMalloc(m_pot->GetImmutableDataSize());
+        m_pvImmutableData = malloc(m_pot->GetImmutableDataSize());
         if (NULL != m_pvImmutableData)
         {
             ZeroMemory(m_pvImmutableData, m_pot->GetImmutableDataSize());
@@ -80,7 +80,7 @@ CPalObjectBase::Initialize(
             goto InitializeExit;
         }
 
-        m_pvLocalData = InternalMalloc(m_pot->GetProcessLocalDataSize());
+        m_pvLocalData = malloc(m_pot->GetProcessLocalDataSize());
         if (NULL != m_pvLocalData)
         {
             ZeroMemory(m_pvLocalData, m_pot->GetProcessLocalDataSize());

diff --git a/src/coreclr/pal/src/objmgr/shmobject.cpp b/src/coreclr/pal/src/objmgr/shmobject.cpp
@@ -119,7 +119,7 @@ CSharedMemoryObject::Initialize(
             // Allocate local memory to hold the shared data
             //
 
-            m_pvSharedData = InternalMalloc(m_pot->GetSharedDataSize());
+            m_pvSharedData = malloc(m_pot->GetSharedDataSize());
             if (NULL == m_pvSharedData)
             {
                 ERROR("Failure allocating m_pvSharedData (local copy)\n");

diff --git a/src/coreclr/pal/src/sharedmemory/sharedmemory.cpp b/src/coreclr/pal/src/sharedmemory/sharedmemory.cpp
@@ -139,7 +139,7 @@ const UINT64 SharedMemoryHelpers::InvalidSharedThreadId = static_cast<UINT64>(-1
 
 void *SharedMemoryHelpers::Alloc(SIZE_T byteCount)
 {
-    void *buffer = InternalMalloc(byteCount);
+    void *buffer = malloc(byteCount != 0 ? byteCount : 1);
     if (buffer == nullptr)
     {
         throw SharedMemoryException(static_cast<DWORD>(SharedMemoryError::OutOfMemory));

diff --git a/src/coreclr/pal/src/synchmgr/synchmanager.hpp b/src/coreclr/pal/src/synchmgr/synchmanager.hpp
@@ -496,7 +496,7 @@ namespace CorUnix
     class CPalSynchronizationManager : public IPalSynchronizationManager
     {
         friend class CPalSynchMgrController;
-        template <class T> friend T *CorUnix::InternalNew();
+        template <class T, class... Ts> friend T *CorUnix::InternalNew(Ts... args);
 
     public:
         // types

diff --git a/src/coreclr/pal/src/thread/process.cpp b/src/coreclr/pal/src/thread/process.cpp
@@ -734,7 +734,7 @@ CorUnix::InternalCreateProcess(
             }
         }
         EnvironmentEntries++;
-        EnvironmentArray = (char **)InternalMalloc(EnvironmentEntries * sizeof(char *));
+        EnvironmentArray = (char **)malloc(EnvironmentEntries * sizeof(char *));
 
         EnvironmentEntries = 0;
         // Convert the environment block to array of strings
@@ -2028,7 +2028,7 @@ PROCNotifyProcessShutdownDestructor()
 char*
 PROCFormatInt(ULONG32 value)
 {
-    char* buffer = (char*)InternalMalloc(128);
+    char* buffer = (char*)malloc(128);
     if (buffer != nullptr)
     {
         if (sprintf_s(buffer, 128, "%d", value) == -1)
@@ -2050,7 +2050,7 @@ PROCFormatInt(ULONG32 value)
 char*
 PROCFormatInt64(ULONG64 value)
 {
-    char* buffer = (char*)InternalMalloc(128);
+    char* buffer = (char*)malloc(128);
     if (buffer != nullptr)
     {
         if (sprintf_s(buffer, 128, "%lld", value) == -1)
@@ -2089,7 +2089,7 @@ PROCBuildCreateDumpCommandLine(
     }
     const char* DumpGeneratorName = "createdump";
     int programLen = strlen(g_szCoreCLRPath) + strlen(DumpGeneratorName) + 1;
-    char* program = *pprogram = (char*)InternalMalloc(programLen);
+    char* program = *pprogram = (char*)malloc(programLen);
     if (program == nullptr)
     {
         return FALSE;
@@ -2833,7 +2833,7 @@ CorUnix::InitializeProcessCommandLine(
         size_t n = PAL_wcslen(lpwstrFullPath) + 1;
 
         size_t iLen = n;
-        initial_dir = reinterpret_cast<LPWSTR>(InternalMalloc(iLen*sizeof(WCHAR)));
+        initial_dir = reinterpret_cast<LPWSTR>(malloc(iLen*sizeof(WCHAR)));
         if (NULL == initial_dir)
         {
             ERROR("malloc() failed! (initial_dir) \n");
@@ -3760,7 +3760,7 @@ buildArgv(
     pThread = InternalGetCurrentThread();
     /* make sure to allocate enough space, up for the worst case scenario */
     int iLength = (iWlen + lpAppPath.GetCount() + 2);
-    lpAsciiCmdLine = (char *) InternalMalloc(iLength);
+    lpAsciiCmdLine = (char *) malloc(iLength);
 
     if (lpAsciiCmdLine == NULL)
     {
@@ -3940,7 +3940,7 @@ buildArgv(
 
     /* allocate lppargv according to the number of arguments
        in the command line */
-    lppArgv = (char **) InternalMalloc((((*pnArg)+1) * sizeof(char *)));
+    lppArgv = (char **) malloc((((*pnArg)+1) * sizeof(char *)));
 
     if (lppArgv == NULL)
     {