Commit f959cf7
committed
fix: bind an if let payload and a for variable inside a lambda body (#994)
The capture walk grew its bound set for `bind` statements and a lambda's own
parameters and for nothing else, so a name any other construct introduces read
as free and went into the closure's environment. The lambda then emitted a
load of a name the enclosing frame has no local for:
f := fn() -> Int:
if let v = maybe():
return v
return 0
unknown load source 'v' in main
`for x in xs` inside a lambda failed the same way on `x`, which the block
comment above `ir_capture_find_free_vars` already named alongside the `if let`
payload. `if_let`, `while_let` and `for_stmt` are now walked the way `lambda`
already was: the subject and the iterable under the outer bound set, the body
under a set that carries the pattern's names (or the loop variable and index).
An `if let`'s else block stays under the outer set, since the payload is not in
scope there.
That exposed the second half. `ir_emit_let_bindings` decided the
release-of-previous on an rc payload by asking whether the name is in
`ir_untracked_rc_binds`, which is the ENCLOSING function's list — the payload
name was in the enclosing frame's tracked set, so the release was emitted, and
now that the payload no longer comes from a capture slot the lambda had no `v`
to load. It asks the positive question `ir_emit_bind_stmt` already asks
instead: emit the release only for a name this frame tracks. The two agree
everywhere the prepass saw the name, and where it did not the new answer is
the safe one.
Verified by output, against the same body written as a named function:
tests/cases/test_if_let_in_lambda.pith prints five lambda arms beside five
named ones over four rounds, and every pair agrees. All of it failed to
compile before the change.
tests/leaks/leak_lambda_if_let.pith gates the shell: four lambda `if let`
arms over call subjects with by-value payloads, flat at 2.70 mb -> 2.70 mb
across 200k and 800k rounds.
Still open, and separate: a lambda body never runs the rc prologue, so it
tracks no locals and releases none of them — a heap payload the binding takes
a count on is stranded, and so is a bound optional local's shell. That is not
specific to `if let`; a plain `s := "x"` in a lambda leaks the same way.
tests/pending/if_let_frame_ownership.pith measures it beside the generic-body
twin and the named-function controls that already pass.1 parent 2aa6457 commit f959cf7
8 files changed
Lines changed: 23762 additions & 22825 deletions
File tree
- self-host
- bootstrap
- tests
- cases
- expected
- leaks
- pending
- tooling
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
57 | 84 | | |
58 | 85 | | |
59 | 86 | | |
| |||
65 | 92 | | |
66 | 93 | | |
67 | 94 | | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
68 | 98 | | |
69 | | - | |
| 99 | + | |
70 | 100 | | |
71 | 101 | | |
72 | 102 | | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
73 | 115 | | |
74 | 116 | | |
75 | 117 | | |
| |||
84 | 126 | | |
85 | 127 | | |
86 | 128 | | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
91 | | - | |
92 | | - | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
93 | 137 | | |
94 | 138 | | |
95 | 139 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8781 | 8781 | | |
8782 | 8782 | | |
8783 | 8783 | | |
8784 | | - | |
8785 | | - | |
| 8784 | + | |
| 8785 | + | |
| 8786 | + | |
| 8787 | + | |
| 8788 | + | |
| 8789 | + | |
| 8790 | + | |
8786 | 8791 | | |
8787 | 8792 | | |
8788 | 8793 | | |
8789 | 8794 | | |
8790 | 8795 | | |
8791 | | - | |
| 8796 | + | |
8792 | 8797 | | |
8793 | 8798 | | |
8794 | 8799 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
0 commit comments