From fef6e0f584483de6405bd3d5a7cf96a8d87d831d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Norte?= Date: Thu, 17 Jul 2025 12:18:52 -0700 Subject: [PATCH] Back out "Fix incorrect locking in ShadowTree experiment" (#52679) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/52679 Changelog: [internal] Reverting to make the fix easier to pick. Will land again on top. Original commit changeset: c18e967488de Original Phabricator Diff: D78480136 Reviewed By: cortinico Differential Revision: D78497510 fbshipit-source-id: 8037276cb70d27ff695c76cd9575b525568c4489 --- .../react/renderer/mounting/ShadowTree.cpp | 15 ++++----------- .../react/renderer/mounting/ShadowTree.h | 3 +-- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp index c803f80e027..1324cb6b9ef 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp @@ -256,7 +256,7 @@ CommitStatus ShadowTree::commit( { std::unique_lock lock(commitMutex_); - return tryCommit(transaction, commitOptions, true); + return tryCommit(transaction, commitOptions); } } else { while (true) { @@ -276,8 +276,7 @@ CommitStatus ShadowTree::commit( CommitStatus ShadowTree::tryCommit( const ShadowTreeCommitTransaction& transaction, - const CommitOptions& commitOptions, - bool hasLocked) const { + const CommitOptions& commitOptions) const { TraceSection s("ShadowTree::commit"); auto telemetry = TransactionTelemetry{}; @@ -289,10 +288,7 @@ CommitStatus ShadowTree::tryCommit( { // Reading `currentRevision_` in shared manner. - std::shared_lock lock(commitMutex_, std::defer_lock); - if (!hasLocked) { - lock.lock(); - } + std::shared_lock lock(commitMutex_); commitMode = commitMode_; oldRevision = currentRevision_; } @@ -333,10 +329,7 @@ CommitStatus ShadowTree::tryCommit( { // Updating `currentRevision_` in unique manner if it hasn't changed. - std::unique_lock lock(commitMutex_, std::defer_lock); - if (!hasLocked) { - lock.lock(); - } + std::unique_lock lock(commitMutex_); if (currentRevision_.number != oldRevision.number) { return CommitStatus::Failed; diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h index 6824ae9389c..87b6a7afa47 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h +++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h @@ -111,8 +111,7 @@ class ShadowTree final { */ CommitStatus tryCommit( const ShadowTreeCommitTransaction& transaction, - const CommitOptions& commitOptions, - bool hasLocked = false) const; + const CommitOptions& commitOptions) const; /* * Calls `tryCommit` in a loop until it finishes successfully.