cleanup: ExceptionsManager: Delete reportUnhandledException

packages/react-native/Libraries/Core/ExceptionsManager.js

@@ -141,24 +141,27 @@ let inExceptionHandler = false;
  * Logs exceptions to the (native) console and displays them
  */
 function handleException(e: mixed, isFatal: boolean) {
-  let error: Error;
-  if (e instanceof Error) {
-    error = e;
-  } else {
-    // Workaround for reporting errors caused by `throw 'some string'`
-    // Unfortunately there is no way to figure out the stacktrace in this
-    // case, so if you ended up here trying to trace an error, look for
-    // `throw '<error message>'` somewhere in your codebase.
-    error = new SyntheticError(e);
-  }
-  try {
-    inExceptionHandler = true;
-    /* $FlowFixMe[class-object-subtyping] added when improving typing for this
-     * parameters */
-    // $FlowFixMe[incompatible-call]
-    reportException(error, isFatal, /*reportToConsole*/ true);
-  } finally {
-    inExceptionHandler = false;
+  // TODO(T196834299): We should really use a c++ turbomodule for this
+  if (!global.RN$handleException || !global.RN$handleException(e, isFatal)) {
+    let error: Error;
+    if (e instanceof Error) {
+      error = e;
+    } else {
+      // Workaround for reporting errors caused by `throw 'some string'`
+      // Unfortunately there is no way to figure out the stacktrace in this
+      // case, so if you ended up here trying to trace an error, look for
+      // `throw '<error message>'` somewhere in your codebase.
+      error = new SyntheticError(e);
+    }
+    try {
+      inExceptionHandler = true;
+      /* $FlowFixMe[class-object-subtyping] added when improving typing for this
+       * parameters */
+      // $FlowFixMe[incompatible-call]
+      reportException(error, isFatal, /*reportToConsole*/ true);
+    } finally {
+      inExceptionHandler = false;
+    }
   }
 }
 

packages/react-native/Libraries/Core/setUpErrorHandling.js

@@ -21,13 +21,7 @@ ExceptionsManager.installConsoleErrorReporter();
 if (!global.__fbDisableExceptionsManager) {
   const handleError = (e: mixed, isFatal: boolean) => {
     try {
-      // TODO(T196834299): We should really use a c++ turbomodule for this
-      if (
-        !global.RN$handleException ||
-        !global.RN$handleException(e, isFatal)
-      ) {
-        ExceptionsManager.handleException(e, isFatal);
-      }
+      ExceptionsManager.handleException(e, isFatal);
     } catch (ee) {
       console.log('Failed to print error: ', ee.message);
       throw e;

packages/react-native/React/CoreModules/RCTExceptionsManager.mm

@@ -114,12 +114,6 @@ - (void)reportFatal:(NSString *)message
   }
 }
 
-// Deprecated.  Use reportFatalException directly instead.
-RCT_EXPORT_METHOD(reportUnhandledException : (NSString *)message stack : (NSArray<NSDictionary *> *)stack)
-{
-  [self reportFatalException:message stack:stack exceptionId:-1];
-}
-
 RCT_EXPORT_METHOD(dismissRedbox) {}
 
 RCT_EXPORT_METHOD(reportException : (JS::NativeExceptionsManager::ExceptionData &)data)

packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.cpp

@@ -50,6 +50,18 @@ void objectAssign(
   auto assign = Object.getPropertyAsFunction(runtime, "assign");
   assign.callWithThis(runtime, Object, target, value);
 }
+
+jsi::Object wrapInErrorIfNecessary(
+    jsi::Runtime& runtime,
+    const jsi::Value& value) {
+  auto Error = runtime.global().getPropertyAsFunction(runtime, "Error");
+  auto isError =
+      value.isObject() && value.asObject(runtime).instanceOf(runtime, Error);
+  auto error = isError
+      ? value.getObject(runtime)
+      : Error.callAsConstructor(runtime, value).getObject(runtime);
+  return error;
+}
 } // namespace
 
 namespace facebook::react {
@@ -187,7 +199,7 @@ void JsErrorHandler::emitError(
     jsi::JSError& error,
     bool isFatal) {
   auto message = error.getMessage();
-  auto errorObj = error.value().getObject(runtime);
+  auto errorObj = wrapInErrorIfNecessary(runtime, error.value());
   auto componentStackValue = errorObj.getProperty(runtime, "componentStack");
   if (!isLooselyNull(componentStackValue)) {
     message += "\n" + stringifyToCpp(runtime, componentStackValue);

packages/react-native/ReactCommon/react/runtime/ReactInstance.cpp

@@ -391,17 +391,6 @@ bool isTruthy(jsi::Runtime& runtime, const jsi::Value& value) {
   return Boolean.call(runtime, value).getBool();
 }
 
-jsi::Value wrapInErrorIfNecessary(
-    jsi::Runtime& runtime,
-    const jsi::Value& value) {
-  auto Error = runtime.global().getPropertyAsFunction(runtime, "Error");
-  auto isError =
-      value.isObject() && value.asObject(runtime).instanceOf(runtime, Error);
-  auto error = isError ? value.getObject(runtime)
-                       : Error.callAsConstructor(runtime, value);
-  return jsi::Value(runtime, error);
-}
-
 } // namespace
 
 void ReactInstance::initializeRuntime(
@@ -448,8 +437,8 @@ void ReactInstance::initializeRuntime(
                 return jsi::Value(false);
               }
 
-              auto jsError = jsi::JSError(
-                  runtime, wrapInErrorIfNecessary(runtime, args[0]));
+              auto jsError =
+                  jsi::JSError(runtime, jsi::Value(runtime, args[0]));
               jsErrorHandler->handleError(runtime, jsError, isFatal);
 
               return jsi::Value(true);