Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit e4b6392

Browse files
sammy-SCfacebook-github-bot
authored andcommittedMay 7, 2021
Remove gating for block guard
Summary: Changelog: Remove gating around leak fix in TurboModules infra Reviewed By: RSNara Differential Revision: D28253054 fbshipit-source-id: 9b3c236d3752b5ca042f83127e42e69250ccd112
1 parent 10a9a4e commit e4b6392

File tree

3 files changed

+6
-24
lines changed

3 files changed

+6
-24
lines changed
 

‎React/Base/RCTBridge.h

-4
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,6 @@ RCT_EXTERN void RCTEnableTurboModuleEagerInit(BOOL enabled);
160160
RCT_EXTERN BOOL RCTTurboModuleSharedMutexInitEnabled(void);
161161
RCT_EXTERN void RCTEnableTurboModuleSharedMutexInit(BOOL enabled);
162162

163-
// Turn on TurboModule shared mutex initialization
164-
RCT_EXTERN BOOL RCTTurboModuleBlockGuardEnabled(void);
165-
RCT_EXTERN void RCTEnableTurboModuleBlockGuard(BOOL enabled);
166-
167163
// Turn on TurboModule block guard for promises.
168164
RCT_EXTERN BOOL RCTTurboModulePromisesBlockGuardEnabled(void);
169165
RCT_EXTERN void RCTEnableTurboModulePromisesBlockGuard(BOOL enabled);

‎React/Base/RCTBridge.m

-11
Original file line numberDiff line numberDiff line change
@@ -138,17 +138,6 @@ void RCTEnableTurboModuleSharedMutexInit(BOOL enabled)
138138
turboModuleSharedMutexInitEnabled = enabled;
139139
}
140140

141-
static BOOL turboModuleBlockGuardEnabled = NO;
142-
BOOL RCTTurboModuleBlockGuardEnabled(void)
143-
{
144-
return turboModuleBlockGuardEnabled;
145-
}
146-
147-
void RCTEnableTurboModuleBlockGuard(BOOL enabled)
148-
{
149-
turboModuleBlockGuardEnabled = enabled;
150-
}
151-
152141
static BOOL turboModulePromisesBlockGuardEnabled = NO;
153142
BOOL RCTTurboModulePromisesBlockGuardEnabled(void)
154143
{

‎ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.mm

+6-9
Original file line numberDiff line numberDiff line change
@@ -171,15 +171,12 @@ static int32_t getUniqueId()
171171
convertJSIFunctionToCallback(jsi::Runtime &runtime, const jsi::Function &value, std::shared_ptr<CallInvoker> jsInvoker)
172172
{
173173
auto weakWrapper = CallbackWrapper::createWeak(value.getFunction(runtime), runtime, jsInvoker);
174-
RCTBlockGuard *blockGuard;
175-
if (RCTTurboModuleBlockGuardEnabled()) {
176-
blockGuard = [[RCTBlockGuard alloc] initWithCleanup:^() {
177-
auto strongWrapper = weakWrapper.lock();
178-
if (strongWrapper) {
179-
strongWrapper->destroy();
180-
}
181-
}];
182-
}
174+
RCTBlockGuard *blockGuard = [[RCTBlockGuard alloc] initWithCleanup:^() {
175+
auto strongWrapper = weakWrapper.lock();
176+
if (strongWrapper) {
177+
strongWrapper->destroy();
178+
}
179+
}];
183180

184181
BOOL __block wrapperWasCalled = NO;
185182
RCTResponseSenderBlock callback = ^(NSArray *responses) {

0 commit comments

Comments
 (0)
Please sign in to comment.