From 80eed4a4a7a67cde62eaf4d4958446ef9f5657e7 Mon Sep 17 00:00:00 2001 From: Ruslan Shestopalyuk Date: Tue, 13 May 2025 09:39:04 -0700 Subject: [PATCH] Fix data race in usage of ShadowTreeRevisionConsistencyManager (#51293) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/51293 # Changelog: [Internal] - Indirect consequence of https://github.com/facebook/react-native/pull/50484, TSAN started to detect a data race in some configurations. It's possible to have the data race between the `ShadowTreeRevisionConsistencyManager` being set in `RuntimeScheduler` and it being already used in the executor thread (as these things are generally done from different threads). Differential Revision: D74651070 fbshipit-source-id: bda49371d541815119f119e6986de39c21f9b374 --- .../react/renderer/runtimescheduler/RuntimeScheduler_Legacy.h | 4 ++-- .../react/renderer/runtimescheduler/RuntimeScheduler_Modern.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Legacy.h b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Legacy.h index 7f92453add6..13b307df3e0 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Legacy.h +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Legacy.h @@ -182,8 +182,8 @@ class RuntimeScheduler_Legacy final : public RuntimeSchedulerBase { */ std::atomic_bool isPerformingWork_{false}; - ShadowTreeRevisionConsistencyManager* shadowTreeRevisionConsistencyManager_{ - nullptr}; + std::atomic + shadowTreeRevisionConsistencyManager_{nullptr}; RuntimeSchedulerTaskErrorHandler onTaskError_; }; diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Modern.h b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Modern.h index 865980c0a3b..17e2a7ef4fb 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Modern.h +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Modern.h @@ -225,8 +225,8 @@ class RuntimeScheduler_Modern final : public RuntimeSchedulerBase { std::queue pendingRenderingUpdates_; std::unordered_set surfaceIdsWithPendingRenderingUpdates_; - ShadowTreeRevisionConsistencyManager* shadowTreeRevisionConsistencyManager_{ - nullptr}; + std::atomic + shadowTreeRevisionConsistencyManager_{nullptr}; PerformanceEntryReporter* performanceEntryReporter_{nullptr}; RuntimeSchedulerEventTimingDelegate* eventTimingDelegate_{nullptr};