Skip to content

Take 2: Mitigate deadlock hazard in RCTUtils.m #50807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
RSNara wants to merge 1 commit into from
Closed

Take 2: Mitigate deadlock hazard in RCTUtils.m #50807

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 5 additions & 15 deletions packages/react-native/React/Base/RCTUtils.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,10 @@
BOOL RCTIsHomeAssetURL(NSURL *__nullable imageURL);

// Whether the New Architecture is enabled or not
static BOOL _newArchEnabled = false;
BOOL RCTIsNewArchEnabled(void)
{
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
NSNumber *rctNewArchEnabled = (NSNumber *)[[NSBundle mainBundle] objectForInfoDictionaryKey:@"RCTNewArchEnabled"];
_newArchEnabled = rctNewArchEnabled == nil || rctNewArchEnabled.boolValue;
});
return _newArchEnabled;
NSNumber *rctNewArchEnabled = (NSNumber *)[[NSBundle mainBundle] objectForInfoDictionaryKey:@"RCTNewArchEnabled"];
return rctNewArchEnabled == nil || rctNewArchEnabled.boolValue;
}
void RCTSetNewArchEnabled(BOOL enabled)
{
Expand All @@ -52,16 +47,11 @@ void RCTSetNewArchEnabled(BOOL enabled)
// whether the New Arch is enabled or not.
}

static BOOL _legacyWarningEnabled = true;
BOOL RCTAreLegacyLogsEnabled(void)
{
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
NSNumber *rctNewArchEnabled =
(NSNumber *)[[NSBundle mainBundle] objectForInfoDictionaryKey:@"RCTLegacyWarningsEnabled"];
_legacyWarningEnabled = rctNewArchEnabled.boolValue;
});
return _legacyWarningEnabled;
NSNumber *rctNewArchEnabled =
(NSNumber *)[[NSBundle mainBundle] objectForInfoDictionaryKey:@"RCTLegacyWarningsEnabled"];
return rctNewArchEnabled.boolValue;
}

static NSString *__nullable _RCTJSONStringifyNoRetry(id __nullable jsonObject, NSError **error)
Expand Down
Loading