From a156ee9b7327ab23c3bda2316ef61c29d11c4787 Mon Sep 17 00:00:00 2001 From: Ramanpreet Nara Date: Thu, 14 Jan 2021 19:11:29 -0800 Subject: [PATCH] Delete JS TurboModule Codegen Gating Summary: Changelog: [Internal] Reviewed By: fkgozali Differential Revision: D25915171 fbshipit-source-id: b59e21f834a7172055e180eddb9bf15737a6cf0f --- React/Base/RCTBridge.h | 4 ---- React/Base/RCTBridge.m | 11 ----------- .../react/config/ReactFeatureFlags.java | 3 --- .../turbomodule/core/TurboModuleManager.java | 6 ++---- .../jni/ReactCommon/TurboModuleManager.cpp | 18 ++++++------------ .../core/jni/ReactCommon/TurboModuleManager.h | 7 ++----- .../core/ReactCommon/TurboModuleBinding.cpp | 8 +------- .../core/ReactCommon/TurboModuleBinding.h | 3 +-- .../core/platform/ios/RCTTurboModuleManager.mm | 2 +- 9 files changed, 13 insertions(+), 49 deletions(-) diff --git a/React/Base/RCTBridge.h b/React/Base/RCTBridge.h index d86a0d27b97..36678d39629 100644 --- a/React/Base/RCTBridge.h +++ b/React/Base/RCTBridge.h @@ -160,10 +160,6 @@ RCT_EXTERN void RCTEnableTurboModuleEagerInit(BOOL enabled); RCT_EXTERN BOOL RCTTurboModuleSharedMutexInitEnabled(void); RCT_EXTERN void RCTEnableTurboModuleSharedMutexInit(BOOL enabled); -// Turn on TurboModule JS Codegen -RCT_EXTERN BOOL RCTTurboModuleJSCodegenEnabled(void); -RCT_EXTERN void RCTEnableTurboModuleJSCodegen(BOOL enabled); - /** * Async batched bridge used to communicate with the JavaScript application. */ diff --git a/React/Base/RCTBridge.m b/React/Base/RCTBridge.m index d8d5594a12f..cee883f875d 100644 --- a/React/Base/RCTBridge.m +++ b/React/Base/RCTBridge.m @@ -135,17 +135,6 @@ void RCTEnableTurboModuleSharedMutexInit(BOOL enabled) turboModuleSharedMutexInitEnabled = enabled; } -static BOOL turboModuleJSCodegenEnabled = NO; -BOOL RCTTurboModuleJSCodegenEnabled(void) -{ - return turboModuleJSCodegenEnabled; -} - -void RCTEnableTurboModuleJSCodegen(BOOL enabled) -{ - turboModuleJSCodegenEnabled = enabled; -} - @interface RCTBridge () @end diff --git a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java index 2fddf14715c..b1bb234aecd 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java +++ b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java @@ -26,9 +26,6 @@ public class ReactFeatureFlags { /** Should we dispatch TurboModule methods with promise returns to the NativeModules thread? */ public static volatile boolean enableTurboModulePromiseAsyncDispatch = false; - /** Enable TurboModule JS Codegen. */ - public static volatile boolean useTurboModuleJSCodegen = false; - /* * This feature flag enables logs for Fabric */ diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManager.java b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManager.java index 2d254d69ec4..3210a7275ec 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManager.java @@ -60,8 +60,7 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry { runtimeExecutor, (CallInvokerHolderImpl) jsCallInvokerHolder, (CallInvokerHolderImpl) nativeCallInvokerHolder, - delegate, - ReactFeatureFlags.useTurboModuleJSCodegen); + delegate); installJSIBindings(); mEagerInitModuleNames = @@ -293,8 +292,7 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry { RuntimeExecutor runtimeExecutor, CallInvokerHolderImpl jsCallInvokerHolder, CallInvokerHolderImpl nativeCallInvokerHolder, - TurboModuleManagerDelegate tmmDelegate, - boolean enableTurboModuleJSCodegen); + TurboModuleManagerDelegate tmmDelegate); private native void installJSIBindings(); diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.cpp b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.cpp index dd9dd987330..eaf6c789534 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.cpp +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.cpp @@ -26,23 +26,20 @@ TurboModuleManager::TurboModuleManager( RuntimeExecutor runtimeExecutor, std::shared_ptr jsCallInvoker, std::shared_ptr nativeCallInvoker, - jni::alias_ref delegate, - bool enableJSCodegen) + jni::alias_ref delegate) : javaPart_(jni::make_global(jThis)), runtimeExecutor_(runtimeExecutor), jsCallInvoker_(jsCallInvoker), nativeCallInvoker_(nativeCallInvoker), delegate_(jni::make_global(delegate)), - turboModuleCache_(std::make_shared()), - enableJSCodegen_(enableJSCodegen) {} + turboModuleCache_(std::make_shared()) {} jni::local_ref TurboModuleManager::initHybrid( jni::alias_ref jThis, jni::alias_ref runtimeExecutor, jni::alias_ref jsCallInvokerHolder, jni::alias_ref nativeCallInvokerHolder, - jni::alias_ref delegate, - bool enableJSCodegen) { + jni::alias_ref delegate) { auto jsCallInvoker = jsCallInvokerHolder->cthis()->getCallInvoker(); auto nativeCallInvoker = nativeCallInvokerHolder->cthis()->getCallInvoker(); @@ -51,8 +48,7 @@ jni::local_ref TurboModuleManager::initHybrid( runtimeExecutor->cthis()->get(), jsCallInvoker, nativeCallInvoker, - delegate, - enableJSCodegen); + delegate); } void TurboModuleManager::registerNatives() { @@ -74,8 +70,7 @@ void TurboModuleManager::installJSIBindings() { jsCallInvoker_ = std::weak_ptr(jsCallInvoker_), nativeCallInvoker_ = std::weak_ptr(nativeCallInvoker_), delegate_ = jni::make_weak(delegate_), - javaPart_ = jni::make_weak(javaPart_)]( - const std::string &name) -> std::shared_ptr { + javaPart_ = jni::make_weak(javaPart_)](const std::string &name) -> std::shared_ptr { auto turboModuleCache = turboModuleCache_.lock(); auto jsCallInvoker = jsCallInvoker_.lock(); auto nativeCallInvoker = nativeCallInvoker_.lock(); @@ -146,8 +141,7 @@ void TurboModuleManager::installJSIBindings() { return nullptr; }; - TurboModuleBinding::install( - runtime, std::move(turboModuleProvider), enableJSCodegen_); + TurboModuleBinding::install(runtime, std::move(turboModuleProvider)); }); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.h b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.h index 384c5952d68..a8b05fda4d5 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.h +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.h @@ -32,8 +32,7 @@ class TurboModuleManager : public jni::HybridClass { jni::alias_ref runtimeExecutor, jni::alias_ref jsCallInvokerHolder, jni::alias_ref nativeCallInvokerHolder, - jni::alias_ref delegate, - bool enableJSCodegen); + jni::alias_ref delegate); static void registerNatives(); private: @@ -54,7 +53,6 @@ class TurboModuleManager : public jni::HybridClass { * they want to be long-lived or short-lived. */ std::shared_ptr turboModuleCache_; - bool enableJSCodegen_; void installJSIBindings(); explicit TurboModuleManager( @@ -62,8 +60,7 @@ class TurboModuleManager : public jni::HybridClass { RuntimeExecutor runtimeExecutor, std::shared_ptr jsCallInvoker, std::shared_ptr nativeCallInvoker, - jni::alias_ref delegate, - bool enableJSCodegen); + jni::alias_ref delegate); }; } // namespace react diff --git a/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp index d9cfae717e4..81614cf2b04 100644 --- a/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp +++ b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp @@ -27,13 +27,7 @@ TurboModuleBinding::TurboModuleBinding( void TurboModuleBinding::install( jsi::Runtime &runtime, - const TurboModuleProviderFunctionType &&moduleProvider, - bool enableJSTurboModuleCodegen) { - runtime.global().setProperty( - runtime, - "RN$JSTurboModuleCodegenEnabled", - jsi::Value(enableJSTurboModuleCodegen)); - + const TurboModuleProviderFunctionType &&moduleProvider) { runtime.global().setProperty( runtime, "__turboModuleProxy", diff --git a/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h index 934f7a2ac26..96de89bed47 100644 --- a/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h +++ b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h @@ -28,8 +28,7 @@ class TurboModuleBinding { */ static void install( jsi::Runtime &runtime, - const TurboModuleProviderFunctionType &&moduleProvider, - bool enableJSTurboModuleCodegen); + const TurboModuleProviderFunctionType &&moduleProvider); TurboModuleBinding(const TurboModuleProviderFunctionType &&moduleProvider); virtual ~TurboModuleBinding(); diff --git a/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm b/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm index 380420119c7..797a0747b67 100644 --- a/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm +++ b/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm @@ -776,7 +776,7 @@ static Class getFallbackClassFromName(const char *name) }; runtimeExecutor([turboModuleProvider = std::move(turboModuleProvider)](jsi::Runtime &runtime) { - react::TurboModuleBinding::install(runtime, std::move(turboModuleProvider), RCTTurboModuleJSCodegenEnabled()); + react::TurboModuleBinding::install(runtime, std::move(turboModuleProvider)); }); }