Back out "Mitigate deadlock hazard in RCTUtils.m" (facebook#50795)

NickGerleman · facebook-github-bot · commit 3e5c609a1e74 · 2025-04-17T20:14:06.000-07:00
Summary: Pull Request resolved: facebook#50795 This diff causes `rntester-ios` to launch into legacy architecture by default. Changelog: [Internal] Reviewed By: joevilches Differential Revision: D73225574 fbshipit-source-id: 9a4f1967bbabd23936cf2faf9a2bf48a850a4d11
diff --git a/packages/react-native/React/Base/RCTUtils.mm b/packages/react-native/React/Base/RCTUtils.mm
@@ -35,9 +35,15 @@
 BOOL RCTIsHomeAssetURL(NSURL *__nullable imageURL);
 
 // Whether the New Architecture is enabled or not
+static BOOL _newArchEnabled = false;
 BOOL RCTIsNewArchEnabled(void)
 {
-  return ((NSNumber *)[[NSBundle mainBundle] objectForInfoDictionaryKey:@"RCTNewArchEnabled"]).boolValue;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    NSNumber *rctNewArchEnabled = (NSNumber *)[[NSBundle mainBundle] objectForInfoDictionaryKey:@"RCTNewArchEnabled"];
+    _newArchEnabled = rctNewArchEnabled == nil || rctNewArchEnabled.boolValue;
+  });
+  return _newArchEnabled;
 }
 void RCTSetNewArchEnabled(BOOL enabled)
 {
@@ -46,9 +52,16 @@ void RCTSetNewArchEnabled(BOOL enabled)
   // whether the New Arch is enabled or not.
 }
 
+static BOOL _legacyWarningEnabled = true;
 BOOL RCTAreLegacyLogsEnabled(void)
 {
-  return ((NSNumber *)[[NSBundle mainBundle] objectForInfoDictionaryKey:@"RCTLegacyWarningsEnabled"]).boolValue;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    NSNumber *rctNewArchEnabled =
+        (NSNumber *)[[NSBundle mainBundle] objectForInfoDictionaryKey:@"RCTLegacyWarningsEnabled"];
+    _legacyWarningEnabled = rctNewArchEnabled.boolValue;
+  });
+  return _legacyWarningEnabled;
 }
 
 static NSString *__nullable _RCTJSONStringifyNoRetry(id __nullable jsonObject, NSError **error)

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,15 @@`
`35`	`35`	`BOOL RCTIsHomeAssetURL(NSURL *__nullable imageURL);`
`36`	`36`
`37`	`37`	`// Whether the New Architecture is enabled or not`
	`38`	`+static BOOL _newArchEnabled = false;`
`38`	`39`	`BOOL RCTIsNewArchEnabled(void)`
`39`	`40`	`{`
`40`		`- return ((NSNumber *)[[NSBundle mainBundle] objectForInfoDictionaryKey:@"RCTNewArchEnabled"]).boolValue;`
	`41`	`+ static dispatch_once_t onceToken;`
	`42`	`+ dispatch_once(&onceToken, ^{`
	`43`	`+ NSNumber rctNewArchEnabled = (NSNumber )[[NSBundle mainBundle] objectForInfoDictionaryKey:@"RCTNewArchEnabled"];`
	`44`	`+ _newArchEnabled = rctNewArchEnabled == nil \|\| rctNewArchEnabled.boolValue;`
	`45`	`+ });`
	`46`	`+ return _newArchEnabled;`
`41`	`47`	`}`
`42`	`48`	`void RCTSetNewArchEnabled(BOOL enabled)`
`43`	`49`	`{`
`@@ -46,9 +52,16 @@ void RCTSetNewArchEnabled(BOOL enabled)`
`46`	`52`	`// whether the New Arch is enabled or not.`
`47`	`53`	`}`
`48`	`54`
	`55`	`+static BOOL _legacyWarningEnabled = true;`
`49`	`56`	`BOOL RCTAreLegacyLogsEnabled(void)`
`50`	`57`	`{`
`51`		`- return ((NSNumber *)[[NSBundle mainBundle] objectForInfoDictionaryKey:@"RCTLegacyWarningsEnabled"]).boolValue;`
	`58`	`+ static dispatch_once_t onceToken;`
	`59`	`+ dispatch_once(&onceToken, ^{`
	`60`	`+ NSNumber *rctNewArchEnabled =`
	`61`	`+ (NSNumber *)[[NSBundle mainBundle] objectForInfoDictionaryKey:@"RCTLegacyWarningsEnabled"];`
	`62`	`+ _legacyWarningEnabled = rctNewArchEnabled.boolValue;`
	`63`	`+ });`
	`64`	`+ return _legacyWarningEnabled;`
`52`	`65`	`}`
`53`	`66`
`54`	`67`	`static NSString __nullable _RCTJSONStringifyNoRetry(id __nullable jsonObject, NSError *error)`