Fix hydrate recovery with null excess DOM children - #5112
Merged
Conversation
📊 Tachometer Benchmark ResultsSummaryduration
usedJSHeapSize
Resultscreate10kduration
usedJSHeapSize
filter-listduration
usedJSHeapSize
hydrate1kduration
usedJSHeapSize
many-updatesduration
usedJSHeapSize
replace1kduration
usedJSHeapSize
run-warmup-0
run-warmup-1
run-warmup-2
run-warmup-3
run-warmup-4
run-final
text-updateduration
usedJSHeapSize
tododuration
usedJSHeapSize
update10th1kduration
usedJSHeapSize
|
|
Size Change: +40 B (+0.05%) Total Size: 79.3 kB 📦 View Changed
ℹ️ View Unchanged
|
marvinhagemeister
approved these changes
Jun 10, 2026
Merged
JoviDeCroock
added a commit
that referenced
this pull request
Jun 25, 2026
(cherry picked from commit 82ed24e)
Merged
JoviDeCroock
added a commit
that referenced
this pull request
Jun 26, 2026
* Fix hydrate error recovery with null excess DOM children (#5112) (cherry picked from commit 82ed24e) * perf(hooks): avoid redundant allocations and writes in SCU and diffed (#5115) (cherry picked from commit 6aced21) * Fix memory leak hotspots (#5116) - render: clear the root Fragment's props.children after commit so replaced vnode generations are not retained - unmount: clear component._globalContext with the other component references (cherry picked from commit bd0302d) * Flush subtree effects (#5055) (cherry picked from commit d9e8984) * Fix useId stability across async Suspense (#5108) Assisted-By: devx/1b997072-d89c-4f6a-a18f-9525b3ef7a9e (cherry picked from commit 67f0290) * Fix error recovery for partially rendered subtrees (#5120) When a component throws after `diffChildren()` has already started, its `newVNode._children` may contain partially mounted children. The error recovery path always replaced those children with `oldVNode._children`, which can be `undefined` during initial mount. That loses the partially rendered subtree, so children that queued updates are not unmounted and keep their _parentDom. A later queued update can then call `getDomSibling()` through an ancestor whose `_children` is undefined and crash. Only restore old children when the new vnode has no children yet, and discard commit/ref queue entries produced by the failed partial render so lifecycles from the aborted subtree are not committed. (cherry picked from commit 1a3b8b5)
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
summary
Avoid hydration recovery crashes when a suspending or throwing component is diffed with no excess DOM children.
Solution
Guard excessDomChildren access in diff() and add hydration regression coverage.