Fix DisposableEffect to correctly dispose of SaveableStateRegistry (JetBrains#2887)

terrakok · web-flow · commit 5aaf70d00770 · 2026-03-18T15:03:49.000+01:00
- Ensure a proper reference is used for disposal within
`DisposableEffect`.

## Release Notes
N/A
diff --git a/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/platform/CompositionLocals.skiko.kt b/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/platform/CompositionLocals.skiko.kt
@@ -88,7 +88,11 @@ internal fun ProvidePlatformCompositionLocals(
             savedStateRegistryOwner = platformContext.architectureComponentsOwner.savedStateRegistryOwner
         )
     }
-    DisposableEffect(platformContext) { onDispose { saveableStateRegistry.dispose() } }
+    DisposableEffect(platformContext) {
+        //save a reference to dispose of a right object
+        val registry = saveableStateRegistry
+        onDispose { registry.dispose() }
+    }
 
     // TODO: https://youtrack.jetbrains.com/issue/CMP-9752/Properly-implement-HostDefaultProvider-and-LocalHostDefaultProvider-for-CMP
     val hostDefaultProvider = remember(platformContext) {

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,11 @@ internal fun ProvidePlatformCompositionLocals(`
`88`	`88`	`savedStateRegistryOwner = platformContext.architectureComponentsOwner.savedStateRegistryOwner`
`89`	`89`	`)`
`90`	`90`	`}`
`91`		`- DisposableEffect(platformContext) { onDispose { saveableStateRegistry.dispose() } }`
	`91`	`+ DisposableEffect(platformContext) {`
	`92`	`+ //save a reference to dispose of a right object`
	`93`	`+ val registry = saveableStateRegistry`
	`94`	`+ onDispose { registry.dispose() }`
	`95`	`+ }`
`92`	`96`
`93`	`97`	`// TODO: https://youtrack.jetbrains.com/issue/CMP-9752/Properly-implement-HostDefaultProvider-and-LocalHostDefaultProvider-for-CMP`
`94`	`98`	`val hostDefaultProvider = remember(platformContext) {`