From e080ade885d84fa0bd0852b705dd46670b5e78bf Mon Sep 17 00:00:00 2001
From: Nicholas Van Sickle <nvsickle@amazon.com>
Date: Sun, 12 Dec 2021 14:20:16 -0800
Subject: [PATCH] Switch high perf allocator back on for containers, modest
 perf boost

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
---
 Code/Framework/AzCore/AzCore/DOM/DomValue.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Code/Framework/AzCore/AzCore/DOM/DomValue.h b/Code/Framework/AzCore/AzCore/DOM/DomValue.h
index 274f6b1934..4b09068ec4 100644
--- a/Code/Framework/AzCore/AzCore/DOM/DomValue.h
+++ b/Code/Framework/AzCore/AzCore/DOM/DomValue.h
@@ -24,6 +24,7 @@ namespace AZ::Dom
 {
     using KeyType = AZ::Name;
 
+    //! The type of underlying value stored in a value. \see Value
     enum class Type
     {
         Null = 0,
@@ -37,6 +38,9 @@ namespace AZ::Dom
         Opaque = 8,
     };
 
+    //! The allocator used by Value.
+    //! Value heap allocates shared_ptrs for its container storage (Array / Object / Node) alongside the vector
+    //! contents of its container storage.
     class ValueAllocator final : public SimpleSchemaAllocator<AZ::HphaSchema, AZ::HphaSchema::Descriptor, false, false>
     {
     public:
@@ -56,7 +60,7 @@ namespace AZ::Dom
     class Array
     {
     public:
-        using ContainerType = AZStd::vector<Value>;
+        using ContainerType = AZStd::vector<Value, AZStdAlloc<ValueAllocator>>;
         using Iterator = ContainerType::iterator;
         using ConstIterator = ContainerType::const_iterator;
         static constexpr const size_t ReserveIncrement = 4;
@@ -74,7 +78,7 @@ namespace AZ::Dom
     {
     public:
         using EntryType = AZStd::pair<KeyType, Value>;
-        using ContainerType = AZStd::vector<EntryType>;
+        using ContainerType = AZStd::vector<EntryType, AZStdAlloc<ValueAllocator>>;
         using Iterator = ContainerType::iterator;
         using ConstIterator = ContainerType::const_iterator;
         static constexpr const size_t ReserveIncrement = 8;