Skip to content

Revert "[Observation] Ensure deinitialized Observable types don't leave active observations in memory (#82752)" #83492

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
merged 1 commit into from
Aug 9, 2025
Merged

Revert "[Observation] Ensure deinitialized Observable types don't leave active observations in memory (#82752)" #83492

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
26 changes: 4 additions & 22 deletions stdlib/public/Observation/Sources/Observation/ObservationRegistrar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,27 +110,9 @@ public struct ObservationRegistrar: Sendable {
}
}

internal mutating func deinitialize() -> (@Sendable () -> Void)? {
func extractSelf<T>(_ ty: T.Type) -> AnyKeyPath {
return \T.self
}

var tracker: (@Sendable () -> Void)?
lookupIteration: for (keyPath, ids) in lookups {
for id in ids {
if let found = observations[id]?.willSetTracker {
// convert the keyPath into its \Self.self version
let selfKp = _openExistential(type(of: keyPath).rootType, do: extractSelf)
tracker = {
found(selfKp)
}
break lookupIteration
}
}
}
internal mutating func cancelAll() {
observations.removeAll()
lookups.removeAll()
return tracker
}

internal mutating func willSet(keyPath: AnyKeyPath) -> [@Sendable (AnyKeyPath) -> Void] {
Expand Down Expand Up @@ -175,8 +157,8 @@ public struct ObservationRegistrar: Sendable {
state.withCriticalRegion { $0.cancel(id) }
}

internal func deinitialize() {
state.withCriticalRegion { $0.deinitialize() }?()
internal func cancelAll() {
state.withCriticalRegion { $0.cancelAll() }
}

internal func willSet<Subject: Observable, Member>(
Expand Down Expand Up @@ -207,7 +189,7 @@ public struct ObservationRegistrar: Sendable {
}

deinit {
context.deinitialize()
context.cancelAll()
}
}

Expand Down
33 changes: 0 additions & 33 deletions test/stdlib/Observation/Observable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,22 +287,6 @@ final class CowTest {
var container = CowContainer()
}

@Observable
final class DeinitTriggeredObserver {
var property: Int = 3
var property2: Int = 4
let deinitTrigger: () -> Void

init(_ deinitTrigger: @escaping () -> Void) {
self.deinitTrigger = deinitTrigger
}

deinit {
deinitTrigger()
}
}


@main
struct Validator {
@MainActor
Expand Down Expand Up @@ -527,23 +511,6 @@ struct Validator {
expectEqual(subject.container.id, startId)
}

suite.test("weak container observation") {
let changed = CapturedState(state: false)
let deinitialized = CapturedState(state: 0)
var test = DeinitTriggeredObserver {
deinitialized.state += 1
}
withObservationTracking { [weak test] in
_blackHole(test?.property)
_blackHole(test?.property2)
} onChange: {
changed.state = true
}
test = DeinitTriggeredObserver { }
expectEqual(deinitialized.state, 1) // ensure only one invocation is done per deinitialization
expectEqual(changed.state, true)
}

runAllTests()
}
}
Expand Down