Skip to content

refactor: merge std::runtime_error catch blocks in host functions #1109

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

Merged
msluszniak merged 1 commit into from
Apr 29, 2026
Merged

refactor: merge std::runtime_error catch blocks in host functions #1109

Show file tree
Hide file tree
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
5 changes: 0 additions & 5 deletions packages/react-native-executorch/common/rnexecutorch/RnExecutorchInstaller.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,6 @@ class RnExecutorchInstaller {
rt, "message", jsi::String::createFromUtf8(rt, msg));
promise->reject(jsi::Value(rt, std::move(errorData)));
});
} catch (const std::runtime_error &e) {
jsCallInvoker->invokeAsync(
[promise, msg = std::string(e.what())]() {
promise->reject(msg);
});
} catch (const std::exception &e) {
jsCallInvoker->invokeAsync(
[promise, msg = std::string(e.what())]() {
Expand Down
40 changes: 0 additions & 40 deletions packages/react-native-executorch/common/rnexecutorch/host_objects/ModelHostObject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,14 +266,6 @@ template <typename Model> class ModelHostObject : public JsiHostObject {
errorData.setProperty(runtime, "message",
jsi::String::createFromUtf8(runtime, e.what()));
throw jsi::JSError(runtime, jsi::Value(runtime, std::move(errorData)));
} catch (const std::runtime_error &e) {
// This catch should be merged with the next one
// (std::runtime_error inherits from std::exception) HOWEVER react
// native has broken RTTI which breaks proper exception type
// checking. Remove when the following change is present in our
// version:
// https://github.com/facebook/react-native/commit/3132cc88dd46f95898a756456bebeeb6c248f20e
throw jsi::JSError(runtime, e.what());
} catch (const std::exception &e) {
throw jsi::JSError(runtime, e.what());
} catch (...) {
Expand Down Expand Up @@ -344,14 +336,6 @@ template <typename Model> class ModelHostObject : public JsiHostObject {
errorData.setProperty(runtime, "message",
jsi::String::createFromUtf8(runtime, e.what()));
throw jsi::JSError(runtime, jsi::Value(runtime, std::move(errorData)));
} catch (const std::runtime_error &e) {
// This catch should be merged with the next one
// (std::runtime_error inherits from std::exception) HOWEVER react
// native has broken RTTI which breaks proper exception type
// checking. Remove when the following change is present in our
// version:
// https://github.com/facebook/react-native/commit/3132cc88dd46f95898a756456bebeeb6c248f20e
throw jsi::JSError(runtime, e.what());
} catch (const std::exception &e) {
throw jsi::JSError(runtime, e.what());
} catch (...) {
Expand Down Expand Up @@ -426,22 +410,6 @@ template <typename Model> class ModelHostObject : public JsiHostObject {
promise->reject(jsi::Value(runtime, std::move(errorData)));
});
return;
} catch (const std::runtime_error &e) {
// This catch should be merged with the next two
// (std::runtime_error and jsi::JSError inherits from
// std::exception) HOWEVER react native has broken RTTI
// which breaks proper exception type checking. Remove when
// the following change is present in our version:
// https://github.com/facebook/react-native/commit/3132cc88dd46f95898a756456bebeeb6c248f20e
callInvoker->invokeAsync([e = std::move(e), promise]() {
promise->reject(std::string(e.what()));
});
return;
} catch (const jsi::JSError &e) {
callInvoker->invokeAsync([e = std::move(e), promise]() {
promise->reject(std::string(e.what()));
});
return;
} catch (const std::exception &e) {
callInvoker->invokeAsync([e = std::move(e), promise]() {
promise->reject(std::string(e.what()));
Expand Down Expand Up @@ -473,14 +441,6 @@ template <typename Model> class ModelHostObject : public JsiHostObject {
errorData.setProperty(runtime, "message",
jsi::String::createFromUtf8(runtime, e.what()));
throw jsi::JSError(runtime, jsi::Value(runtime, std::move(errorData)));
} catch (const std::runtime_error &e) {
// This catch should be merged with the next one
// (std::runtime_error inherits from std::exception) HOWEVER react
// native has broken RTTI which breaks proper exception type
// checking. Remove when the following change is present in our
// version:
// https://github.com/facebook/react-native/commit/3132cc88dd46f95898a756456bebeeb6c248f20e
throw jsi::JSError(runtime, e.what());
} catch (const std::exception &e) {
throw jsi::JSError(runtime, e.what());
} catch (...) {
Expand Down
Loading