From 4b07665496f060459020f3f6c250807f26d0a80f Mon Sep 17 00:00:00 2001
From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
Date: Mon, 6 Dec 2021 18:35:39 -0800
Subject: [PATCH] Removes Heap allocator from being possible to use as a
 SystemAllocator since it doesnt allow dynamic allocating (only works with
 pre-allocated blocks)

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
---
 .../AzCore/AzCore/Memory/SystemAllocator.cpp     | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/Code/Framework/AzCore/AzCore/Memory/SystemAllocator.cpp b/Code/Framework/AzCore/AzCore/Memory/SystemAllocator.cpp
index 8c84338fd0..9ce681ef2d 100644
--- a/Code/Framework/AzCore/AzCore/Memory/SystemAllocator.cpp
+++ b/Code/Framework/AzCore/AzCore/Memory/SystemAllocator.cpp
@@ -19,7 +19,6 @@
 
 #define AZCORE_SYSTEM_ALLOCATOR_HPHA 1
 #define AZCORE_SYSTEM_ALLOCATOR_MALLOC 2
-#define AZCORE_SYSTEM_ALLOCATOR_HEAP 3
 
 #if !defined(AZCORE_SYSTEM_ALLOCATOR)
     // define the default
@@ -30,8 +29,6 @@
     #include <AzCore/Memory/HphaSchema.h>
 #elif AZCORE_SYSTEM_ALLOCATOR == AZCORE_SYSTEM_ALLOCATOR_MALLOC
     #include <AzCore/Memory/MallocSchema.h>
-#elif AZCORE_SYSTEM_ALLOCATOR == AZCORE_SYSTEM_ALLOCATOR_HEAP
-    #include <AzCore/Memory/HeapSchema.h>
 #else
     #error "Invalid allocator selected for SystemAllocator"
 #endif
@@ -46,8 +43,6 @@ static bool g_isSystemSchemaUsed = false;
     static AZStd::aligned_storage<sizeof(HphaSchema), AZStd::alignment_of<HphaSchema>::value>::type g_systemSchema;
 #elif AZCORE_SYSTEM_ALLOCATOR == AZCORE_SYSTEM_ALLOCATOR_MALLOC
     static AZStd::aligned_storage<sizeof(MallocSchema), AZStd::alignment_of<MallocSchema>::value>::type g_systemSchema;
-#elif AZCORE_SYSTEM_ALLOCATOR == AZCORE_SYSTEM_ALLOCATOR_HEAP
-    static AZStd::aligned_storage<sizeof(HeapSchema), AZStd::alignment_of<HeapSchema>::value>::type g_systemSchema;
 #endif
 
 //////////////////////////////////////////////////////////////////////////
@@ -121,11 +116,6 @@ SystemAllocator::Create(const Descriptor& desc)
         heapDesc.m_systemChunkSize = desc.m_heap.m_systemChunkSize;
 #elif AZCORE_SYSTEM_ALLOCATOR == AZCORE_SYSTEM_ALLOCATOR_MALLOC
         MallocSchema::Descriptor heapDesc;
-#elif AZCORE_SYSTEM_ALLOCATOR == AZCORE_SYSTEM_ALLOCATOR_HEAP
-        HeapSchema::Descriptor heapDesc;
-        memcpy(heapDesc.m_memoryBlocks, desc.m_heap.m_memoryBlocks, sizeof(heapDesc.m_memoryBlocks));
-        memcpy(heapDesc.m_memoryBlocksByteSize, desc.m_heap.m_memoryBlocksByteSize, sizeof(heapDesc.m_memoryBlocksByteSize));
-        heapDesc.m_numMemoryBlocks = desc.m_heap.m_numMemoryBlocks;
 #endif
         if (&AllocatorInstance<SystemAllocator>::Get() == this) // if we are the system allocator
         {
@@ -135,8 +125,6 @@ SystemAllocator::Create(const Descriptor& desc)
             m_allocator = new(&g_systemSchema)HphaSchema(heapDesc);
 #elif AZCORE_SYSTEM_ALLOCATOR == AZCORE_SYSTEM_ALLOCATOR_MALLOC
             m_allocator = new(&g_systemSchema)MallocSchema(heapDesc);
-#elif AZCORE_SYSTEM_ALLOCATOR == AZCORE_SYSTEM_ALLOCATOR_HEAP
-            m_allocator = new(&g_systemSchema)HeapSchema(heapDesc);
 #endif
             g_isSystemSchemaUsed = true;
             isReady = true;
@@ -150,8 +138,6 @@ SystemAllocator::Create(const Descriptor& desc)
             m_allocator = azcreate(HphaSchema, (heapDesc), SystemAllocator);
 #elif AZCORE_SYSTEM_ALLOCATOR == AZCORE_SYSTEM_ALLOCATOR_MALLOC
             m_allocator = azcreate(MallocSchema, (heapDesc), SystemAllocator);
-#elif AZCORE_SYSTEM_ALLOCATOR == AZCORE_SYSTEM_ALLOCATOR_HEAP
-            m_allocator = azcreate(HeapSchema, (heapDesc), SystemAllocator);
 #endif
             if (m_allocator == nullptr)
             {
@@ -188,8 +174,6 @@ SystemAllocator::Destroy()
             static_cast<HphaSchema*>(m_allocator)->~HphaSchema();
 #elif AZCORE_SYSTEM_ALLOCATOR == AZCORE_SYSTEM_ALLOCATOR_MALLOC
             static_cast<MallocSchema*>(m_allocator)->~MallocSchema();
-#elif AZCORE_SYSTEM_ALLOCATOR == AZCORE_SYSTEM_ALLOCATOR_HEAP
-            static_cast<HeapSchema*>(m_allocator)->~HeapSchema();
 #endif
             g_isSystemSchemaUsed = false;
         }