Remove unused compGetMem functions

* compGetMemA and compGetMemArrayA are useless because ArenaAllocator always returns aligned memory
* compGetMemCallback is not used anywhere
* compFreeMem is not used anywhere.  The function is not used anywhere either but let's keep it for consistency.

diff --git a/src/jit/compiler.cpp b/src/jit/compiler.cpp
index ee137e3..d2dcfd8 100644 (file)
--- a/src/jit/compiler.cpp
+++ b/src/jit/compiler.cpp
@@ -2158,19 +2158,6 @@ void Compiler::compDoComponentUnitTestsOnce()
 }
 #endif // DEBUG
 
-/******************************************************************************
- *
- *  The Emitter uses this callback function to allocate its memory
- */
-
-/* static */
-void* Compiler::compGetMemCallback(void* p, size_t size, CompMemKind cmk)
-{
-    assert(p);
-
-    return ((Compiler*)p)->compGetMem(size, cmk);
-}
-
 /*****************************************************************************
  *
  *  The central memory allocation routine used by the compiler. Normally this
@@ -5093,7 +5080,7 @@ bool Compiler::compQuirkForPPP()
         assert((varDscExposedStruct->lvExactSize / TARGET_POINTER_SIZE) == 8);
 
         BYTE* oldGCPtrs = varDscExposedStruct->lvGcLayout;
-        BYTE* newGCPtrs = (BYTE*)compGetMemA(8, CMK_LvaTable);
+        BYTE* newGCPtrs = (BYTE*)compGetMem(8, CMK_LvaTable);
 
         for (int i = 0; i < 4; i++)
         {

diff --git a/src/jit/compiler.h b/src/jit/compiler.h
index dd4fb30..5eb6fc6 100644 (file)
--- a/src/jit/compiler.h
+++ b/src/jit/compiler.h
@@ -8731,10 +8731,7 @@ public:
 #endif // LOOP_HOIST_STATS
 
     void* compGetMemArray(size_t numElem, size_t elemSize, CompMemKind cmk = CMK_Unknown);
-    void* compGetMemArrayA(size_t numElem, size_t elemSize, CompMemKind cmk = CMK_Unknown);
     void* compGetMem(size_t sz, CompMemKind cmk = CMK_Unknown);
-    void* compGetMemA(size_t sz, CompMemKind cmk = CMK_Unknown);
-    static void* compGetMemCallback(void*, size_t, CompMemKind cmk = CMK_Unknown);
     void compFreeMem(void*);
 
     bool compIsForImportOnly();

diff --git a/src/jit/compiler.hpp b/src/jit/compiler.hpp
index f357e6f..f68161d 100644 (file)
--- a/src/jit/compiler.hpp
+++ b/src/jit/compiler.hpp
@@ -4335,16 +4335,6 @@ __forceinline void* Compiler::compGetMemArray(size_t numElem, size_t elemSize, C
     return compGetMem(numElem * elemSize, cmk);
 }
 
-__forceinline void* Compiler::compGetMemArrayA(size_t numElem, size_t elemSize, CompMemKind cmk)
-{
-    if (numElem > (MAX_MEMORY_PER_ALLOCATION / elemSize))
-    {
-        NOMEM();
-    }
-
-    return compGetMemA(numElem * elemSize, cmk);
-}
-
 /******************************************************************************
  *
  *  Roundup the allocated size so that if this memory block is aligned,
@@ -4352,31 +4342,10 @@ __forceinline void* Compiler::compGetMemArrayA(size_t numElem, size_t elemSize,
  *  The JIT will always try to keep all the blocks aligned.
  */
 
-inline void* Compiler::compGetMemA(size_t sz, CompMemKind cmk)
-{
-    assert(sz);
-
-    size_t allocSz = roundUp(sz, sizeof(size_t));
-
-#if MEASURE_MEM_ALLOC
-    genMemStats.AddAlloc(allocSz, cmk);
-#endif
-
-    void* ptr = compAllocator->allocateMemory(allocSz);
-
-    // Verify that the current block is aligned. Only then will the next
-    // block allocated be on an aligned boundary.
-    assert((size_t(ptr) & (sizeof(size_t) - 1)) == 0);
-
-    return ptr;
-}
-
 inline void Compiler::compFreeMem(void* ptr)
 {
 }
 
-#define compFreeMem(ptr) compFreeMem((void*)ptr)
-
 inline bool Compiler::compIsProfilerHookNeeded()
 {
 #ifdef PROFILING_SUPPORTED

diff --git a/src/jit/ee_il_dll.cpp b/src/jit/ee_il_dll.cpp
index 0cfc565..a918dc9 100644 (file)
--- a/src/jit/ee_il_dll.cpp
+++ b/src/jit/ee_il_dll.cpp
@@ -724,7 +724,7 @@ void Compiler::eeGetVars()
     {
         // Allocate a bit-array for all the variables and initialize to false
 
-        bool*    varInfoProvided = (bool*)compGetMemA(info.compLocalsCount * sizeof(varInfoProvided[0]));
+        bool*    varInfoProvided = (bool*)compGetMem(info.compLocalsCount * sizeof(varInfoProvided[0]));
         unsigned i;
         for (i = 0; i < info.compLocalsCount; i++)
         {

diff --git a/src/jit/eeinterface.cpp b/src/jit/eeinterface.cpp
index d8db947..d054196 100644 (file)
--- a/src/jit/eeinterface.cpp
+++ b/src/jit/eeinterface.cpp
@@ -151,7 +151,7 @@ const char* Compiler::eeGetMethodFullName(CORINFO_METHOD_HANDLE hnd)
 
     length += param.siglength + 2;
 
-    char* retName = (char*)compGetMemA(length, CMK_DebugOnly);
+    char* retName = (char*)compGetMem(length, CMK_DebugOnly);
 
     /* Now generate the full signature string in the allocated buffer */
 

diff --git a/src/jit/flowgraph.cpp b/src/jit/flowgraph.cpp
index 0f9a28c..09e0b69 100644 (file)
--- a/src/jit/flowgraph.cpp
+++ b/src/jit/flowgraph.cpp
@@ -19351,7 +19351,7 @@ const char* Compiler::fgProcessEscapes(const char* nameIn, escapeMapping_t* map)
 
     if (subsitutionRequired)
     {
-        char* newName = (char*)compGetMemA(lengthOut, CMK_DebugOnly);
+        char* newName = (char*)compGetMem(lengthOut, CMK_DebugOnly);
         char* pDest;
         pDest = newName;
         pChar = nameIn;

diff --git a/src/jit/gcencode.cpp b/src/jit/gcencode.cpp
index a48f745..0d234dc 100644 (file)
--- a/src/jit/gcencode.cpp
+++ b/src/jit/gcencode.cpp
@@ -1910,7 +1910,7 @@ PendingArgsStack::PendingArgsStack(unsigned maxDepth, Compiler* pComp)
     /* Do we need an array as well as the mask ? */
 
     if (pasMaxDepth > BITS_IN_pasMask)
-        pasTopArray = (BYTE*)pComp->compGetMemA(pasMaxDepth - BITS_IN_pasMask);
+        pasTopArray = (BYTE*)pComp->compGetMem(pasMaxDepth - BITS_IN_pasMask);
 }
 
 //-----------------------------------------------------------------------------

diff --git a/src/jit/importer.cpp b/src/jit/importer.cpp
index d671894..ae89c3a 100644 (file)
--- a/src/jit/importer.cpp
+++ b/src/jit/importer.cpp
@@ -17117,7 +17117,7 @@ void Compiler::verInitBBEntryState(BasicBlock* block, EntryState* srcState)
         return;
     }
 
-    block->bbEntryState = (EntryState*)compGetMemA(sizeof(EntryState));
+    block->bbEntryState = (EntryState*)compGetMem(sizeof(EntryState));
 
     // block->bbEntryState.esRefcount = 1;
 

diff --git a/src/jit/lclvars.cpp b/src/jit/lclvars.cpp
index e5165ba..3c8fd09 100644 (file)
--- a/src/jit/lclvars.cpp
+++ b/src/jit/lclvars.cpp
@@ -2261,7 +2261,7 @@ void Compiler::lvaSetStruct(unsigned varNum, CORINFO_CLASS_HANDLE typeHnd, bool
         size_t lvSize = varDsc->lvSize();
         assert((lvSize % sizeof(void*)) ==
                0); // The struct needs to be a multiple of sizeof(void*) bytes for getClassGClayout() to be valid.
-        varDsc->lvGcLayout = (BYTE*)compGetMemA((lvSize / sizeof(void*)) * sizeof(BYTE), CMK_LvaTable);
+        varDsc->lvGcLayout = (BYTE*)compGetMem((lvSize / sizeof(void*)) * sizeof(BYTE), CMK_LvaTable);
         unsigned  numGCVars;
         var_types simdBaseType = TYP_UNKNOWN;
         varDsc->lvType         = impNormStructType(typeHnd, varDsc->lvGcLayout, &numGCVars, &simdBaseType);

diff --git a/src/jit/regalloc.cpp b/src/jit/regalloc.cpp
index a911994..9d630ef 100644 (file)
--- a/src/jit/regalloc.cpp
+++ b/src/jit/regalloc.cpp
@@ -6805,7 +6805,7 @@ void Compiler::rpRecordPrediction()
         if (rpBestRecordedPrediction == NULL)
         {
             rpBestRecordedPrediction =
-                reinterpret_cast<VarRegPrediction*>(compGetMemArrayA(lvaCount, sizeof(VarRegPrediction)));
+                reinterpret_cast<VarRegPrediction*>(compGetMemArray(lvaCount, sizeof(VarRegPrediction)));
         }
         for (unsigned k = 0; k < lvaCount; k++)
         {

diff --git a/src/jit/utils.cpp b/src/jit/utils.cpp
index 4e061fa..2bf9bd0 100644 (file)
--- a/src/jit/utils.cpp
+++ b/src/jit/utils.cpp
@@ -1004,7 +1004,7 @@ FixedBitVect* FixedBitVect::bitVectInit(UINT size, Compiler* comp)
 
     assert(bitVectMemSize * bitChunkSize() >= size);
 
-    bv = (FixedBitVect*)comp->compGetMemA(sizeof(FixedBitVect) + bitVectMemSize, CMK_FixedBitVect);
+    bv = (FixedBitVect*)comp->compGetMem(sizeof(FixedBitVect) + bitVectMemSize, CMK_FixedBitVect);
     memset(bv->bitVect, 0, bitVectMemSize);
 
     bv->bitVectSize = size;