Skip to content

Fix portal mutation tracker launch crash #10008

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
azooz2003-bit merged 2 commits into from
Aug 11, 2026
Merged

Fix portal mutation tracker launch crash #10008

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
b0c8c17
fix(portal): retain inserted views through hooks
azooz2003-bit Aug 11, 2026
7d53ebd
fix(portal): track insertion before AppKit consumes child
azooz2003-bit Aug 11, 2026
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
14 changes: 6 additions & 8 deletions Sources/PortalSplitDividerCacheInvalidator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@ private typealias PortalSubviewComparator = @convention(c) (
private extension NSView {
@objc(cmux_portalAddSubview:)
func cmux_portalAddSubview(_ subview: NSView) {
let previousWindow = subview.window
cmux_portalAddSubview(subview)
PortalViewHierarchyMutationTracker.recordInsertion(
PortalViewHierarchyMutationTracker.prepareForInsertion(
parentView: self,
insertedView: subview,
previousWindow: previousWindow
previousWindow: subview.window
)
cmux_portalAddSubview(subview)
}

@objc(cmux_portalAddSubview:positioned:relativeTo:)
Expand All @@ -25,13 +24,12 @@ private extension NSView {
positioned place: NSWindow.OrderingMode,
relativeTo otherView: NSView?
) {
let previousWindow = subview.window
cmux_portalAddSubview(subview, positioned: place, relativeTo: otherView)
PortalViewHierarchyMutationTracker.recordInsertion(
PortalViewHierarchyMutationTracker.prepareForInsertion(
parentView: self,
insertedView: subview,
previousWindow: previousWindow
previousWindow: subview.window
)
cmux_portalAddSubview(subview, positioned: place, relativeTo: otherView)
}

@objc(cmux_portalSetSubviews:)
Expand Down
10 changes: 6 additions & 4 deletions Sources/PortalViewHierarchyMutationTracker.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,12 @@ final class PortalViewHierarchyMutationTracker: NSObject {
return registration
}

/// Records an insertion after AppKit has attached the child. Unknown
/// prebuilt subtrees fail closed, while a leaf under an indexed no-split
/// branch stays on the fast path without a full cache rebuild.
static func recordInsertion(
/// Updates the hierarchy proof before handing the borrowed child reference
/// to AppKit. SwiftUI may consume that reference during insertion, so the
/// swizzled boundary must not access it after the original implementation
/// returns. Unknown prebuilt subtrees fail closed, while a leaf under an
/// indexed no-split branch stays on the fast path.
static func prepareForInsertion(
parentView: NSView,
insertedView: NSView,
previousWindow: NSWindow?
Expand Down