From 18529facef1fbcc4f8b7ed07651ae78b2cc0cc2a Mon Sep 17 00:00:00 2001
From: Ben Doherty <bendoherty@google.com>
Date: Thu, 13 Feb 2025 15:31:00 -0800
Subject: [PATCH] Fix TSAN violation in HandleAllocator (#8438)

---
 filament/backend/include/private/backend/HandleAllocator.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/filament/backend/include/private/backend/HandleAllocator.h b/filament/backend/include/private/backend/HandleAllocator.h
index a1c727ecbe..5b702686a4 100644
--- a/filament/backend/include/private/backend/HandleAllocator.h
+++ b/filament/backend/include/private/backend/HandleAllocator.h
@@ -29,6 +29,7 @@
 
 #include <tsl/robin_map.h>
 
+#include <atomic>
 #include <cstddef>
 #include <exception>
 #include <mutex>
@@ -426,7 +427,7 @@ private:
     // Below is only used when running out of space in the HandleArena
     mutable utils::Mutex mLock;
     tsl::robin_map<HandleBase::HandleId, void*> mOverflowMap;
-    HandleBase::HandleId mId = 0;
+    std::atomic<HandleBase::HandleId> mId = 0;
     bool mUseAfterFreeCheckDisabled = false;
 };