@depup/react-native 0.86.2-depup.0 → 0.87.0-depup.0

package/ReactCommon/cxxreact/ReactMarker.cpp

@@ -9,40 +9,22 @@
 
 namespace facebook::react::ReactMarker {
 
-#if __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wglobal-constructors"
-#endif
-
-LogTaggedMarker logTaggedMarkerBridgelessImpl = nullptr;
-LogTaggedMarker logTaggedMarkerImpl = nullptr;
-std::shared_mutex logTaggedMarkerImplMutex;
-
-#if __clang__
-#pragma clang diagnostic pop
-#endif
+AtomicLogTaggedMarker logTaggedMarkerImpl;
 
 void logMarker(const ReactMarkerId markerId) {
   logTaggedMarker(markerId, nullptr);
 }
 
 void logTaggedMarker(const ReactMarkerId markerId, const char* tag) {
-  LogTaggedMarker marker = nullptr;
-  {
-    std::shared_lock lock(logTaggedMarkerImplMutex);
-    marker = logTaggedMarkerImpl;
-  }
-  if (marker != nullptr) {
-    marker(markerId, tag);
-  }
+  logTaggedMarkerImpl(markerId, tag);
 }
 
 void logMarkerBridgeless(const ReactMarkerId markerId) {
-  logTaggedMarkerBridgeless(markerId, nullptr);
+  logTaggedMarker(markerId, nullptr);
 }
 
 void logTaggedMarkerBridgeless(const ReactMarkerId markerId, const char* tag) {
-  logTaggedMarkerBridgelessImpl(markerId, tag);
+  logTaggedMarker(markerId, tag);
 }
 
 void logMarkerDone(const ReactMarkerId markerId, double markerTime) {
@@ -120,18 +102,10 @@ double StartupLogger::getInitReactRuntimeStartTime() {
   return initReactRuntimeStartTime;
 }
 
-double StartupLogger::getInitReactRuntimeEndTime() {
-  return initReactRuntimeEndTime;
-}
-
 double StartupLogger::getRunJSBundleStartTime() {
   return runJSBundleStartTime;
 }
 
-double StartupLogger::getRunJSBundleEndTime() {
-  return runJSBundleEndTime;
-}
-
 double StartupLogger::getAppStartupEndTime() {
   return appStartupEndTime;
 }

package/ReactCommon/cxxreact/ReactMarker.h

@@ -8,11 +8,9 @@
 #pragma once
 
 #include <cmath>
-#include <shared_mutex>
-
-#ifdef __APPLE__
 #include <functional>
-#endif
+#include <mutex>
+#include <shared_mutex>
 
 namespace facebook::react::ReactMarker {
 
@@ -36,28 +34,49 @@ enum ReactMarkerId {
   REACT_INSTANCE_INIT_STOP
 };
 
-#ifdef __APPLE__
-using LogTaggedMarker = std::function<void(const ReactMarkerId, const char *tag)>; // Bridge only
-using LogTaggedMarkerBridgeless = std::function<void(const ReactMarkerId, const char *tag)>;
-#else
-typedef void (*LogTaggedMarker)(const ReactMarkerId, const char *tag); // Bridge only
-typedef void (*LogTaggedMarkerBridgeless)(const ReactMarkerId, const char *tag);
-#endif
+using LogTaggedMarker = std::function<void(ReactMarkerId, const char *tag)>;
+using LogTaggedMarkerBridgeless = LogTaggedMarker;
 
 #ifndef RN_EXPORT
 #define RN_EXPORT __attribute__((visibility("default")))
 #endif
 
-extern RN_EXPORT std::shared_mutex logTaggedMarkerImplMutex;
-/// - important: To ensure this gets read and written to in a thread safe
-/// manner, make use of `logTaggedMarkerImplMutex`.
-extern RN_EXPORT LogTaggedMarker logTaggedMarkerImpl;
-extern RN_EXPORT LogTaggedMarker logTaggedMarkerBridgelessImpl;
+/// Thread-safe holder for a LogTaggedMarker callback. Reads and writes are
+/// internally synchronized, so callers do not need external locking.
+struct RN_EXPORT AtomicLogTaggedMarker {
+  AtomicLogTaggedMarker &operator=(LogTaggedMarker marker)
+  {
+    std::unique_lock lock(mutex_);
+    impl_ = std::move(marker);
+    return *this;
+  }
+
+  explicit operator bool() const noexcept
+  {
+    std::shared_lock lock(mutex_);
+    return static_cast<bool>(impl_);
+  }
+
+  void operator()(ReactMarkerId markerId, const char *tag) const
+  {
+    std::shared_lock lock(mutex_);
+    if (impl_) {
+      impl_(markerId, tag);
+    }
+  }
+
+ private:
+  LogTaggedMarker impl_;
+  mutable std::shared_mutex mutex_;
+};
+
+extern RN_EXPORT AtomicLogTaggedMarker logTaggedMarkerImpl;
 
-extern RN_EXPORT void logMarker(ReactMarkerId markerId); // Bridge only
-extern RN_EXPORT void logTaggedMarker(ReactMarkerId markerId,
-                                      const char *tag); // Bridge only
+extern RN_EXPORT void logMarker(ReactMarkerId markerId);
+extern RN_EXPORT void logTaggedMarker(ReactMarkerId markerId, const char *tag);
+[[deprecated("Use logMarker instead")]]
 extern RN_EXPORT void logMarkerBridgeless(ReactMarkerId markerId);
+[[deprecated("Use logTaggedMarker instead")]]
 extern RN_EXPORT void logTaggedMarkerBridgeless(ReactMarkerId markerId, const char *tag);
 
 struct ReactMarkerEvent {
@@ -74,9 +93,7 @@ class RN_EXPORT StartupLogger {
   void reset();
   double getAppStartupStartTime();
   double getInitReactRuntimeStartTime();
-  double getInitReactRuntimeEndTime();
   double getRunJSBundleStartTime();
-  double getRunJSBundleEndTime();
   double getAppStartupEndTime();
 
  private:

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -13,15 +13,15 @@
 #include <string_view>
 
 #define REACT_NATIVE_VERSION_MAJOR 0
-#define REACT_NATIVE_VERSION_MINOR 86
-#define REACT_NATIVE_VERSION_PATCH 2
+#define REACT_NATIVE_VERSION_MINOR 87
+#define REACT_NATIVE_VERSION_PATCH 0
 
 namespace facebook::react {
 
 struct ReactNativeVersionType {
   int32_t Major = 0;
-  int32_t Minor = 86;
-  int32_t Patch = 2;
+  int32_t Minor = 87;
+  int32_t Patch = 0;
   std::string_view Prerelease = "";
 };
 

package/ReactCommon/cxxreact/TraceSection.h

@@ -110,7 +110,7 @@ using TraceSectionUnwrapped = DummyTraceSection;
  * In the case of WITH_LOOM_TRACE we don't use the signposts APIs because of the
  * templated type for TraceSection.
  */
-#if defined(__APPLE__) && OS_LOG_TARGET_HAS_10_15_FEATURES && !defined(WITH_LOOM_TRACE)
+#if defined(__APPLE__) && OS_LOG_TARGET_HAS_10_15_FEATURES && !defined(WITH_LOOM_TRACE) && !defined(WITH_PERFETTO)
 
 namespace systrace {
 

package/ReactCommon/cxxreact/tests/methodcall.cpp

@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#ifndef RCT_REMOVE_LEGACY_ARCH
+
 #include <cxxreact/MethodCall.h>
 
 #include <folly/json.h>
@@ -152,3 +154,5 @@ TEST(parseMethodCalls, ParseTwoCalls) {
   auto returnedCalls = parseMethodCalls(folly::parseJson(jsText));
   EXPECT_EQ(2, returnedCalls.size());
 }
+
+#endif // RCT_REMOVE_LEGACY_ARCH

package/ReactCommon/hermes/React-hermes.podspec

@@ -9,7 +9,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/hermes/executor/HermesExecutorFactory.cpp

@@ -17,11 +17,6 @@
 
 #include <hermes/inspector-modern/chrome/HermesRuntimeTargetDelegate.h>
 
-#if defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
-#include <hermes/inspector-modern/chrome/Registration.h>
-#include <hermes/inspector/RuntimeAdapter.h>
-#endif
-
 using namespace facebook::hermes;
 using namespace facebook::jsi;
 
@@ -29,43 +24,6 @@ namespace facebook::react {
 
 namespace {
 
-#if defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
-
-class HermesExecutorRuntimeAdapter
-    : public facebook::hermes::inspector_modern::RuntimeAdapter {
- public:
-  HermesExecutorRuntimeAdapter(
-      std::shared_ptr<HermesRuntime> runtime,
-      std::shared_ptr<MessageQueueThread> thread)
-      : runtime_(runtime), thread_(std::move(thread)) {}
-
-  virtual ~HermesExecutorRuntimeAdapter() = default;
-
-  HermesRuntime& getRuntime() override {
-    return *runtime_;
-  }
-
-  void tickleJs() override {
-    thread_->runOnQueue(
-        [weakRuntime = std::weak_ptr<HermesRuntime>(runtime_)]() {
-          auto runtime = weakRuntime.lock();
-          if (!runtime) {
-            return;
-          }
-          jsi::Function func =
-              runtime->global().getPropertyAsFunction(*runtime, "__tickleJs");
-          func.call(*runtime);
-        });
-  }
-
- private:
-  std::shared_ptr<HermesRuntime> runtime_;
-
-  std::shared_ptr<MessageQueueThread> thread_;
-};
-
-#endif // defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
-
 struct ReentrancyCheck {
 // This is effectively a very subtle and complex assert, so only
 // include it in builds which would include asserts.
@@ -133,14 +91,11 @@ struct ReentrancyCheck {
 #endif
 };
 
-// This adds ReentrancyCheck and debugger enable/teardown to the given
-// Runtime.
+// This adds ReentrancyCheck to the given Runtime.
 class DecoratedRuntime : public jsi::WithRuntimeDecorator<ReentrancyCheck> {
  public:
   // The first argument may be another decorater which itself
   // decorates the real HermesRuntime, depending on the build config.
-  // The second argument is the real HermesRuntime as well to
-  // manage the debugger registration.
   DecoratedRuntime(
       std::unique_ptr<Runtime> runtime,
       HermesRuntime& hermesRuntime,
@@ -149,42 +104,17 @@ class DecoratedRuntime : public jsi::WithRuntimeDecorator<ReentrancyCheck> {
       const std::string& debuggerName)
       : jsi::WithRuntimeDecorator<ReentrancyCheck>(*runtime, reentrancyCheck_),
         runtime_(std::move(runtime)) {
-#if defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
-    enableDebugger_ = enableDebugger;
-    if (enableDebugger_) {
-      std::shared_ptr<HermesRuntime> rt(runtime_, &hermesRuntime);
-      auto adapter =
-          std::make_unique<HermesExecutorRuntimeAdapter>(rt, jsQueue);
-      debugToken_ = facebook::hermes::inspector_modern::chrome::enableDebugging(
-          std::move(adapter), debuggerName);
-    }
-#else
+    (void)hermesRuntime;
     (void)jsQueue;
-#endif // HERMES_ENABLE_DEBUGGER
+    (void)enableDebugger;
+    (void)debuggerName;
   }
 
-  ~DecoratedRuntime() {
-#if defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
-    if (enableDebugger_) {
-      facebook::hermes::inspector_modern::chrome::disableDebugging(debugToken_);
-    }
-#endif // HERMES_ENABLE_DEBUGGER
-  }
+  ~DecoratedRuntime() {}
 
  private:
-  // runtime_ is a potentially decorated Runtime.
-  // hermesRuntime is a reference to a HermesRuntime managed by runtime_.
-  //
-  // HermesExecutorRuntimeAdapter requirements are kept, because the
-  // dtor will disable debugging on the HermesRuntime before the
-  // member managing it is destroyed.
-
   std::shared_ptr<Runtime> runtime_;
   ReentrancyCheck reentrancyCheck_;
-#if defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
-  bool enableDebugger_;
-  facebook::hermes::inspector_modern::chrome::DebugSessionToken debugToken_;
-#endif // HERMES_ENABLE_DEBUGGER
 };
 
 } // namespace
@@ -221,10 +151,7 @@ std::unique_ptr<JSExecutor> HermesExecutorFactory::createJSExecutor(
   //
   // DecoratedRuntime is held by JSIExecutor.  When it gets used, it
   // will check that it's on the right thread, do any necessary trace
-  // logging, then call the real HermesRuntime.  When it is destroyed,
-  // it will shut down the debugger before the HermesRuntime is.  In
-  // the normal case where debugging is not compiled in,
-  // all that's left is the thread checking.
+  // logging, then call the real HermesRuntime.
 
   // Add js engine information to Error.prototype so in error reporting we
   // can send this information.

package/ReactCommon/hermes/executor/React-jsitracing.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "../../..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/jserrorhandler/ErrorUtils.cpp

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "ErrorUtils.h"
+
+namespace facebook::react {
+
+void handleJSError(
+    jsi::Runtime& runtime,
+    const jsi::JSError& error,
+    bool isFatal) {
+  auto errorUtils = runtime.global().getProperty(runtime, "ErrorUtils");
+  if (errorUtils.isUndefined() || !errorUtils.isObject() ||
+      !errorUtils.getObject(runtime).hasProperty(runtime, "reportFatalError") ||
+      !errorUtils.getObject(runtime).hasProperty(runtime, "reportError")) {
+    // ErrorUtils was not set up. This probably means the bundle didn't
+    // load properly.
+    throw jsi::JSError(
+        runtime,
+        "ErrorUtils is not set up properly. Something probably went wrong trying to load the JS bundle. Trying to report error " +
+            error.getMessage(),
+        error.getStack());
+  }
+
+  // TODO(janzer): Rewrite this function to return the processed error
+  // instead of just reporting it through the native module
+  if (isFatal) {
+    auto func = errorUtils.asObject(runtime).getPropertyAsFunction(
+        runtime, "reportFatalError");
+    func.call(runtime, error.value());
+  } else {
+    auto func = errorUtils.asObject(runtime).getPropertyAsFunction(
+        runtime, "reportError");
+    func.call(runtime, error.value());
+  }
+}
+
+} // namespace facebook::react

package/{React/CxxLogUtils/RCTDefaultCxxLogFunction.h → ReactCommon/jserrorhandler/ErrorUtils.h}

@@ -7,10 +7,10 @@
 
 #pragma once
 
-#import <logger/react_native_log.h>
+#include <jsi/jsi.h>
 
 namespace facebook::react {
 
-void RCTDefaultCxxLogFunction(ReactNativeLogLevel level, const char *message);
+void handleJSError(jsi::Runtime &runtime, const jsi::JSError &error, bool isFatal);
 
 } // namespace facebook::react

package/ReactCommon/jserrorhandler/JsErrorHandler.cpp

@@ -6,12 +6,12 @@
  */
 
 #include "JsErrorHandler.h"
-#include <cxxreact/ErrorUtils.h>
 #include <glog/logging.h>
 #include <react/bridging/Bridging.h>
 #include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <ostream>
 #include <string>
+#include "ErrorUtils.h"
 #include "StackTraceParser.h"
 
 using namespace facebook;

package/ReactCommon/jserrorhandler/React-jserrorhandler.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
   s.platforms              = min_supported_versions
   s.source                 = source
   s.header_dir             = "jserrorhandler"
-  s.source_files           = podspec_sources(["JsErrorHandler.{cpp,h}", "StackTraceParser.{cpp,h}"], ["JsErrorHandler.h", "StackTraceParser.h"])
+  s.source_files           = podspec_sources(["ErrorUtils.{cpp,h}", "JsErrorHandler.{cpp,h}", "StackTraceParser.{cpp,h}"], ["ErrorUtils.h", "JsErrorHandler.h", "StackTraceParser.h"])
   s.pod_target_xcconfig = {
     "USE_HEADERMAP" => "YES",
     "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard()
@@ -37,8 +37,7 @@ Pod::Spec.new do |s|
   resolve_use_frameworks(s, header_mappings_dir: '../', module_name: "React_jserrorhandler")
 
   s.dependency "React-jsi"
-  s.dependency "React-cxxreact"
-  s.dependency "ReactCommon/turbomodule/bridging"
+  s.dependency "React-bridging"
   add_dependency(s, "React-featureflags")
   add_dependency(s, "React-debug")
 

package/ReactCommon/jsi/React-jsi.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/ReactCommon/jsi/jsi/hermes-interfaces.h

@@ -26,6 +26,59 @@ namespace debugger {
 class Debugger;
 }
 
+/// IEventLoopControl is defined by the integrator to allow the Runtime to
+/// schedule some task to be run when convenient, and to keep track of "Task
+/// sources". After it is set to a Runtime, the integrator must ensure that the
+/// `IEventLoopControl` instance outlives the Runtime. The IEventLoopControl
+/// methods may be called by the Runtime from any thread, so they must be
+/// thread-safe and cannot perform any VM operations.
+struct IEventLoopControl {
+  /// `scheduleTask` is a function used by the caller (the Runtime) to schedule
+  /// some \p task. The scheduled task may perform VM operations. Thus, the
+  /// integrator must only run the tasks when it had exclusive access to the
+  /// Runtime.
+  virtual void scheduleTask(const std::function<void()>& task) = 0;
+  /// Used by the caller (the Runtime) to register a new source that can
+  /// schedule new work via `scheduleTask`. This method return an uint64
+  /// identifying the source registered. As an example, a WebWorker instance may
+  /// schedule a message-processing task via `scheduleTask`, and thus is
+  /// considered as a "task queue source". The Runtime may register each Worker
+  /// using this method. This is useful for the integrator to keep track of
+  /// active "sources".
+  virtual uint64_t registerTaskQueueSource() = 0;
+  /// Used by the caller to unregister a source when it is not allowed to invoke
+  /// `scheduleTasks` anymore. The source is identified by \p sourceId, which is
+  /// provided when the source was originally register in
+  /// `registerTaskQueueSource`. As an example, after WebWorker instance is
+  /// terminated, it will not schedule more tasks. The Runtime may unregister
+  /// the Worker instance, and the integrator may exit the event-loop if there
+  /// are no more active sources.
+  virtual void unregisterTaskQueueSource(uint64_t sourceId) = 0;
+
+ protected:
+  ~IEventLoopControl() = default;
+};
+
+/// Interface for setting the IEventLoopControl in the Runtime.
+struct JSI_EXPORT ISetEventLoopControl : public jsi::ICast {
+ public:
+  static constexpr jsi::UUID uuid{
+      0x7b6902e6,
+      0xfd38,
+      0x11f0,
+      0x8de9,
+      0x0242ac120002};
+
+  /// Configures the eventloop control mechanism using \p eventLoopControl.
+  virtual void setEventLoopControl(IEventLoopControl* eventLoopControl) = 0;
+  /// Retrieves the IEventLoopControl if it was set previously. Otherwise,
+  /// return nullptr.
+  virtual IEventLoopControl* getEventLoopControl() = 0;
+
+ protected:
+  ~ISetEventLoopControl() = default;
+};
+
 /// Interface for Hermes-specific runtime methods.The actual implementations of
 /// the pure virtual methods are provided by Hermes API.
 class JSI_EXPORT IHermes : public jsi::ICast {

package/ReactCommon/jsiexecutor/React-jsiexecutor.podspec

@@ -8,7 +8,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
 version = package['version']
 
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
@@ -26,7 +26,8 @@ Pod::Spec.new do |s|
   s.platforms              = min_supported_versions
   s.source                 = source
   s.source_files           = podspec_sources("jsireact/*.{cpp,h}", "jsireact/*.h")
-  s.pod_target_xcconfig    = { "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard() }
+  s.pod_target_xcconfig    = { "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
+                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/..\"" }
   s.header_dir             = "jsireact"
 
   s.dependency "React-cxxreact"

package/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp

@@ -7,13 +7,13 @@
 
 #include "jsireact/JSIExecutor.h"
 
-#include <cxxreact/ErrorUtils.h>
 #include <cxxreact/JSBigString.h>
 #include <cxxreact/ModuleRegistry.h>
 #include <cxxreact/ReactMarker.h>
 #include <cxxreact/TraceSection.h>
 #include <folly/json.h>
 #include <glog/logging.h>
+#include <jserrorhandler/ErrorUtils.h>
 #include <jsi/JSIDynamic.h>
 #include <jsi/instrumentation.h>
 #include <reactperflogger/BridgeNativeModulePerfLogger.h>
@@ -144,25 +144,14 @@ void JSIExecutor::initializeRuntime() {
   if (runtimeInstaller_) {
     runtimeInstaller_(*runtime_);
   }
-  bool hasLogger = false;
-  {
-    std::shared_lock lock(ReactMarker::logTaggedMarkerImplMutex);
-    hasLogger = ReactMarker::logTaggedMarkerImpl != nullptr;
-  }
-  if (hasLogger) {
-    ReactMarker::logMarker(ReactMarker::CREATE_REACT_CONTEXT_STOP);
-  }
+  ReactMarker::logMarker(ReactMarker::CREATE_REACT_CONTEXT_STOP);
 }
 
 void JSIExecutor::loadBundle(
     std::unique_ptr<const JSBigString> script,
     std::string sourceURL) {
   TraceSection s("JSIExecutor::loadBundle");
-  bool hasLogger = false;
-  {
-    std::shared_lock lock(ReactMarker::logTaggedMarkerImplMutex);
-    hasLogger = ReactMarker::logTaggedMarkerImpl != nullptr;
-  }
+  bool hasLogger(ReactMarker::logTaggedMarkerImpl);
   std::string scriptName = simpleBasename(sourceURL);
   if (hasLogger) {
     ReactMarker::logTaggedMarker(

package/ReactCommon/jsiexecutor/jsireact/JSINativeModules.cpp

@@ -70,15 +70,8 @@ void JSINativeModules::reset() {
 std::optional<Object> JSINativeModules::createModule(
     Runtime& rt,
     const std::string& name) {
-  bool hasLogger = false;
-  {
-    std::shared_lock lock(ReactMarker::logTaggedMarkerImplMutex);
-    hasLogger = ReactMarker::logTaggedMarkerImpl != nullptr;
-  }
-  if (hasLogger) {
-    ReactMarker::logTaggedMarker(
-        ReactMarker::NATIVE_MODULE_SETUP_START, name.c_str());
-  }
+  ReactMarker::logTaggedMarker(
+      ReactMarker::NATIVE_MODULE_SETUP_START, name.c_str());
 
   auto result = m_moduleRegistry->getConfig(name);
   if (!result.has_value()) {
@@ -101,10 +94,8 @@ std::optional<Object> JSINativeModules::createModule(
   std::optional<Object> module(
       moduleInfo.asObject(rt).getPropertyAsObject(rt, "module"));
 
-  if (hasLogger) {
-    ReactMarker::logTaggedMarker(
-        ReactMarker::NATIVE_MODULE_SETUP_STOP, name.c_str());
-  }
+  ReactMarker::logTaggedMarker(
+      ReactMarker::NATIVE_MODULE_SETUP_STOP, name.c_str());
 
   return module;
 }