Gate TurboModule block copy behind an MC

Summary: Changelog: [Internal] Reviewed By: fkgozali Differential Revision: D24145506 fbshipit-source-id: 7e374c3bd2378cc1dcd9372d7cbb10ae445a2582
facebook · Oct 7, 2020 · 5535031 · 5535031
1 parent fd9787e
commit 5535031
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/React/Base/RCTBridge.h b/React/Base/RCTBridge.h
@@ -161,6 +161,10 @@ RCT_EXTERN void RCTEnableTurboModuleEagerInit(BOOL enabled);
 RCT_EXTERN BOOL RCTTurboModuleSharedMutexInitEnabled(void);
 RCT_EXTERN void RCTEnableTurboModuleSharedMutexInit(BOOL enabled);
 
+// Turn on TurboModule block copy
+RCT_EXTERN BOOL RCTTurboModuleBlockCopyEnabled(void);
+RCT_EXTERN void RCTEnableTurboModuleBlockCopy(BOOL enabled);
+
 /**
  * Async batched bridge used to communicate with the JavaScript application.
  */

diff --git a/React/Base/RCTBridge.m b/React/Base/RCTBridge.m
@@ -136,6 +136,17 @@ void RCTEnableTurboModuleSharedMutexInit(BOOL enabled)
   turboModuleSharedMutexInitEnabled = enabled;
 }
 
+static BOOL turboModuleBlockCopyEnabled = NO;
+BOOL RCTTurboModuleBlockCopyEnabled(void)
+{
+  return turboModuleBlockCopyEnabled;
+}
+
+void RCTEnableTurboModuleBlockCopy(BOOL enabled)
+{
+  turboModuleBlockCopyEnabled = enabled;
+}
+
 @interface RCTBridge () <RCTReloadListener>
 @end
 

diff --git a/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.mm b/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.mm
@@ -195,7 +195,11 @@ static int32_t getUniqueId()
     wrapperWasCalled = YES;
   };
 
-  return [callback copy];
+  if (RCTTurboModuleBlockCopyEnabled()) {
+    return [callback copy];
+  }
+
+  return callback;
 }
 
 namespace facebook {
@@ -636,8 +640,13 @@ static int32_t getUniqueId()
             runtime,
             jsInvoker_,
             ^(RCTPromiseResolveBlock resolveBlock, RCTPromiseRejectBlock rejectBlock) {
-              RCTPromiseResolveBlock resolveCopy = [resolveBlock copy];
-              RCTPromiseRejectBlock rejectCopy = [rejectBlock copy];
+              RCTPromiseResolveBlock resolveCopy = resolveBlock;
+              RCTPromiseRejectBlock rejectCopy = rejectBlock;
+
+              if (RCTTurboModuleBlockCopyEnabled()) {
+                resolveCopy = [resolveBlock copy];
+                rejectCopy = [rejectBlock copy];
+              }
 
               [inv setArgument:(void *)&resolveCopy atIndex:count + 2];
               [inv setArgument:(void *)&rejectCopy atIndex:count + 3];