Skip to content

Fix crash on reload when useImmediateExecutorInAndroidBridgeless is enabled #45162

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
javache wants to merge 2 commits into from
Closed

Fix crash on reload when useImmediateExecutorInAndroidBridgeless is enabled #45162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b55fd5d
Match convertRawProp error handling in iterator-based props parsing
javache Jun 25, 2024
9734bfe
Fix crash on reload when useImmediateExecutorInAndroidBridgeless is e…
javache Jun 25, 2024
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
18 changes: 9 additions & 9 deletions ...ges/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1416,6 +1416,9 @@ private Task<ReactInstance> getOrCreateReloadTask(String reason) {

final ReactContext reactContext = mBridgelessReactContextRef.getNullable();
if (reactContext != null) {
log(method, "Resetting ReactContext ref");
mBridgelessReactContextRef.reset();

log(method, "Destroying ReactContext");
reactContext.destroy();
}
Expand All @@ -1439,20 +1442,17 @@ private Task<ReactInstance> getOrCreateReloadTask(String reason) {
raiseSoftException(
method, "Skipping ReactInstance.destroy(): ReactInstance null");
} else {
log(method, "Resetting ReactInstance ptr");
mReactInstance = null;

log(method, "Destroying ReactInstance");
reactInstance.destroy();
}

log(method, "Resetting ReactContext ref");
mBridgelessReactContextRef.reset();

log(method, "Resetting ReactInstance task ref");
log(method, "Resetting createReactInstance task ref");
mCreateReactInstanceTaskRef.reset();

log(method, "Resetting ReactInstance ptr");
mReactInstance = null;

log(method, "Resetting preload task ref");
log(method, "Resetting start task ref");
mStartTask = null;

// Kickstart a new ReactInstance create
Expand All @@ -1462,7 +1462,7 @@ private Task<ReactInstance> getOrCreateReloadTask(String reason) {
.continueWithTask(
task -> {
final ReactInstance reactInstance =
reactInstanceTaskUnwrapper.unwrap(task, "7: Restarting surfaces");
reactInstanceTaskUnwrapper.unwrap(task, "6: Restarting surfaces");

if (reactInstance == null) {
raiseSoftException(method, "Skipping surface restart: ReactInstance null");
Expand Down
26 changes: 15 additions & 11 deletions packages/react-native/ReactCommon/react/renderer/core/PropsMacros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,19 @@
struct, blockStart, prefix "BlockStart" suffix, rawValue)

// Rebuild a type that contains multiple fields from a single field value
#define REBUILD_FIELD_SWITCH_CASE( \
defaults, rawValue, property, field, fieldName) \
case CONSTEXPR_RAW_PROPS_KEY_HASH(fieldName): { \
if ((rawValue).hasValue()) { \
decltype((defaults).field) res; \
fromRawValue(context, rawValue, res); \
(property).field = res; \
} else { \
(property).field = (defaults).field; \
} \
return; \
#define REBUILD_FIELD_SWITCH_CASE( \
defaults, rawValue, property, field, fieldName) \
case CONSTEXPR_RAW_PROPS_KEY_HASH(fieldName): { \
if ((rawValue).hasValue()) [[likely]] { \
try { \
fromRawValue(context, rawValue, (property).field); \
} catch (const std::exception& e) { \
LOG(ERROR) << "Error while converting prop '" << fieldName \
<< "': " << e.what(); \
(property).field = (defaults).field; \
} \
} else { \
(property).field = (defaults).field; \
} \
return; \
}