From 7bde660772e2fddeb329db6bbac446edd4dda983 Mon Sep 17 00:00:00 2001 From: anton dunchev Date: Fri, 15 Sep 2023 16:12:26 -0400 Subject: [PATCH] [ConcurrentLinearAllocator] Fix third place where 64k was passed in as an alignment for non fastpath platforms. #tests editor #rnx #rb trivial [CL 27931460 by anton dunchev in ue5-main branch] --- .../Core/Public/Experimental/ConcurrentLinearAllocator.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engine/Source/Runtime/Core/Public/Experimental/ConcurrentLinearAllocator.h b/Engine/Source/Runtime/Core/Public/Experimental/ConcurrentLinearAllocator.h index d6efae6ae7ab..62b5682b4b51 100644 --- a/Engine/Source/Runtime/Core/Public/Experimental/ConcurrentLinearAllocator.h +++ b/Engine/Source/Runtime/Core/Public/Experimental/ConcurrentLinearAllocator.h @@ -405,7 +405,7 @@ public: //support for oversized Blocks if (HeaderSize + Size + Alignment > BlockAllocationTag::BlockSize) { - FBlockHeader* LargeHeader = new (BlockAllocationTag::Allocator::Malloc(HeaderSize + Size + Alignment, BlockAllocationTag::BlockSize)) FBlockHeader; + FBlockHeader* LargeHeader = new (BlockAllocationTag::Allocator::Malloc(HeaderSize + Size + Alignment, alignof(FBlockHeader))) FBlockHeader; MemoryTrace_MarkAllocAsHeap(uint64(LargeHeader), EMemoryTraceRootHeap::SystemMemory); checkSlow(IsAligned(LargeHeader, alignof(FBlockHeader)));