From b19bf2b6d79fd4d5dd838c2d024726494129917e Mon Sep 17 00:00:00 2001
From: Phillip Pan <phillippan@meta.com>
Date: Wed, 12 Jun 2024 21:13:38 -0700
Subject: [PATCH] ship shared module queue (#44916)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/44916

Changelog: [Internal]

reached ship decision last year, getting rid of the gating here

Reviewed By: javache

Differential Revision: D58476997

fbshipit-source-id: 0ad52d29ac79b1751d6f10e67dc6886bf88e5ba4
---
 packages/react-native/React/Base/RCTBridge.h       |  4 ----
 packages/react-native/React/Base/RCTBridge.mm      | 12 ------------
 .../ios/ReactCommon/RCTTurboModuleManager.mm       | 14 ++------------
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/packages/react-native/React/Base/RCTBridge.h b/packages/react-native/React/Base/RCTBridge.h
index db6fd81646474f..23937c1854826a 100644
--- a/packages/react-native/React/Base/RCTBridge.h
+++ b/packages/react-native/React/Base/RCTBridge.h
@@ -61,10 +61,6 @@ void RCTEnableFabricInteropLayer(BOOL enabled);
 BOOL RCTTurboModuleSyncVoidMethodsEnabled(void);
 void RCTEnableTurboModuleSyncVoidMethods(BOOL enabled);
 
-// Use a shared queue for executing module methods
-BOOL RCTTurboModuleSharedQueueEnabled(void);
-void RCTEnableTurboModuleSharedQueue(BOOL enabled);
-
 BOOL RCTUIManagerDispatchAccessibilityManagerInitOntoMain(void);
 void RCTUIManagerSetDispatchAccessibilityManagerInitOntoMain(BOOL enabled);
 
diff --git a/packages/react-native/React/Base/RCTBridge.mm b/packages/react-native/React/Base/RCTBridge.mm
index b97429823d63f0..43b8f05d1e8f7d 100644
--- a/packages/react-native/React/Base/RCTBridge.mm
+++ b/packages/react-native/React/Base/RCTBridge.mm
@@ -167,18 +167,6 @@ void RCTEnableTurboModuleSyncVoidMethods(BOOL enabled)
   gTurboModuleEnableSyncVoidMethods = enabled;
 }
 
-// Use a shared queue for executing module methods
-static BOOL gTurboModuleEnableSharedQueue = NO;
-BOOL RCTTurboModuleSharedQueueEnabled(void)
-{
-  return gTurboModuleEnableSharedQueue;
-}
-
-void RCTEnableTurboModuleSharedQueue(BOOL enabled)
-{
-  gTurboModuleEnableSharedQueue = enabled;
-}
-
 BOOL kDispatchAccessibilityManagerInitOntoMain = NO;
 BOOL RCTUIManagerDispatchAccessibilityManagerInitOntoMain(void)
 {
diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm
index 7354f6bc54f393..d113d52eedd31e 100644
--- a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm
+++ b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm
@@ -217,7 +217,6 @@ @implementation RCTTurboModuleManager {
   RCTBridgeProxy *_bridgeProxy;
   RCTBridgeModuleDecorator *_bridgeModuleDecorator;
 
-  BOOL _enableSharedModuleQueue;
   dispatch_queue_t _sharedModuleQueue;
 }
 
@@ -234,11 +233,7 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
     _bridgeProxy = bridgeProxy;
     _bridgeModuleDecorator = bridgeModuleDecorator;
     _invalidating = false;
-    _enableSharedModuleQueue = RCTTurboModuleSharedQueueEnabled();
-
-    if (_enableSharedModuleQueue) {
-      _sharedModuleQueue = dispatch_queue_create("com.meta.react.turbomodulemanager.queue", DISPATCH_QUEUE_SERIAL);
-    }
+    _sharedModuleQueue = dispatch_queue_create("com.meta.react.turbomodulemanager.queue", DISPATCH_QUEUE_SERIAL);
 
     if (RCTTurboModuleInteropEnabled()) {
       // TODO(T174674274): Implement lazy loading of legacy modules in the new architecture.
@@ -728,12 +723,7 @@ - (BOOL)_shouldCreateObjCModule:(Class)moduleClass
    * following if condition's block.
    */
   if (!methodQueue) {
-    if (_enableSharedModuleQueue) {
-      methodQueue = _sharedModuleQueue;
-    } else {
-      NSString *methodQueueName = [NSString stringWithFormat:@"com.facebook.react.%sQueue", moduleName];
-      methodQueue = dispatch_queue_create(methodQueueName.UTF8String, DISPATCH_QUEUE_SERIAL);
-    }
+    methodQueue = _sharedModuleQueue;
 
     if (moduleHasMethodQueueGetter) {
       /**