From c907d067f41930bd6a4bbef9903febfab1090982 Mon Sep 17 00:00:00 2001
From: Runitai Linden <davep@lindenlab.com>
Date: Tue, 26 Oct 2021 09:23:17 -0500
Subject: SL-16243 Followup -- fix for inconsistently calling
 TracyAlloc/TracyFree

---
 indra/llcommon/llcommon.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/llcommon/llcommon.cpp b/indra/llcommon/llcommon.cpp
index 04872564bf..25a809dad2 100644
--- a/indra/llcommon/llcommon.cpp
+++ b/indra/llcommon/llcommon.cpp
@@ -44,7 +44,6 @@ void *operator new(size_t size)
     {
         LL_PROFILE_ZONE_SCOPED;
         ptr = (malloc)(size);
-        TracyAlloc(ptr, size);
     }
     else
     {
@@ -54,15 +53,16 @@ void *operator new(size_t size)
     {
         throw std::bad_alloc();
     }
+    TracyAlloc(ptr, size);
     return ptr;
 }
 
 void operator delete(void *ptr) noexcept
 {
+    TracyFree(ptr);
     if (gProfilerEnabled)
     {
         LL_PROFILE_ZONE_SCOPED;
-        TracyFree(ptr);
         (free)(ptr);
     }
     else
-- 
cgit v1.2.3