Skip to content

Commit 035e9b2

Browse files
committed
fix(signals): restore deferred releases after cleanup throws
1 parent a2743fa commit 035e9b2

3 files changed

Lines changed: 73 additions & 2 deletions

File tree

‎.changeset/quiet-lazy-cleanups.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@solidjs/signals": patch
3+
---
4+
5+
Restore deferred lazy releases when an unfinished frame's cleanup throws, so later unrelated lazy memos still clean up when their last observer is removed.

‎packages/signals/src/core/core.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,8 +400,11 @@ export function recompute(el: Computed<any>, create: boolean = false): void {
400400
// ends, if the pass doesn't read it again (#4142).
401401
const prev = deferredReleases;
402402
deferReleases((released = []));
403-
disposeChildren(el);
404-
deferReleases(prev);
403+
try {
404+
disposeChildren(el);
405+
} finally {
406+
deferReleases(prev);
407+
}
405408
} else if (el._firstChild !== null || el._disposal !== null) parkChildren(el);
406409
// An error a pass staged (D-41) is replaced by this pass's answer: a
407410
// value, a flight, or an error of its own (#4109, #4145).
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
import { expect, it } from "vitest";
2+
import {
3+
createMemo,
4+
createRenderEffect,
5+
createRoot,
6+
createSignal,
7+
flush,
8+
onCleanup
9+
} from "../src/index.js";
10+
11+
// #4164 defers last-reader releases while an unfinished pass's frame is
12+
// dismantled. A cleanup throw must not leave that collector installed for
13+
// later, unrelated disposal.
14+
it.each([false, true])(
15+
"a cleanup throw does not suppress unrelated lazy cleanup (throws: %s)",
16+
throws => {
17+
const failure = new Error("cleanup failed");
18+
const [version, setVersion] = createSignal(0);
19+
const disposePending = createRoot(dispose => {
20+
createMemo(() => {
21+
version();
22+
onCleanup(() => {
23+
if (throws) throw failure;
24+
});
25+
return new Promise<number>(() => {});
26+
});
27+
return dispose;
28+
});
29+
let disposeOther: (() => void) | undefined;
30+
try {
31+
flush();
32+
setVersion(1);
33+
if (throws) expect(() => flush()).toThrow(failure);
34+
else expect(() => flush()).not.toThrow();
35+
36+
let cleaned = 0;
37+
let stop!: () => void;
38+
disposeOther = createRoot(dispose => {
39+
const value = createMemo(
40+
() => {
41+
onCleanup(() => cleaned++);
42+
return 1;
43+
},
44+
{ lazy: true }
45+
);
46+
stop = createRoot(dispose => {
47+
createRenderEffect(value, () => {});
48+
return dispose;
49+
});
50+
return dispose;
51+
});
52+
flush();
53+
stop();
54+
flush();
55+
// Its owner is still alive: losing the last observer releases it.
56+
expect(cleaned).toBe(1);
57+
} finally {
58+
disposeOther?.();
59+
disposePending();
60+
flush();
61+
}
62+
}
63+
);

0 commit comments

Comments
 (0)