Commit 3cec5e6
# PR: fix(vm): reset implicit return value when pushing new call frames
Fixes #4485.
`Vm::return_value` is shared across all call frames but never gets reset
in `push_frame()`. This means functions without an explicit `return`
leak the caller's last evaluated expression as their return value:
```js
function f() {}
5;
f(); // returns 5 instead of undefined
```
What happens is `SetAccumulator` writes `5` into `vm.return_value` for
the caller, then `f()` pushes a new frame without clearing it. When `f`
returns, `handle_return()` picks up the stale `5`.
The fix resets `self.return_value = JsValue::undefined()` at the top of
`push_frame()`.
### Generators
This was the main concern from the PR #4713 review — whether resetting
in `push_frame()` would break generator resumption since
`GeneratorContext::resume()` also calls `push_frame()` with
`REGISTERS_ALREADY_PUSHED`.
Traced through the code and it's fine: `GeneratorYield` sets
`return_value` explicitly before calling `handle_yield()`, and
`handle_yield()` consumes it via `take_return_value()`. On resume, the
generator runs more opcodes and will set a fresh `return_value` before
the next yield/return. The reset only affects the initial state going
into the frame, which is what we want.
Added generator-specific regression tests as @jedel1043 requested in
#4713.
### Tests
- Plain functions leaking caller values
- Constructor implicit returns
- Cross-eval isolation
- Generator yield + return correctness
- Generator implicit return producing `undefined`
- Nested call chain independence
---------
Co-authored-by: Rahul Tripathi <rahultripathi7009@gmail.com>
1 parent df1f0ff commit 3cec5e6
2 files changed
Lines changed: 129 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 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 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
21 | 147 | | |
22 | 148 | | |
23 | 149 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
586 | 586 | | |
587 | 587 | | |
588 | 588 | | |
| 589 | + | |
| 590 | + | |
| 591 | + | |
589 | 592 | | |
590 | 593 | | |
591 | 594 | | |
| |||
0 commit comments