Repository navigation
Commit 4a6443d
committed
Keep only the current conditionals a replayed statement's recorded walk kept
A statement replayed from a loop's previous pass carried the recorded exit's
whole holder list onto the current scope for each expression whose
conditional holders the statement changed. When the current holders of that
expression differed from the recorded entry's, the recorded ones described
the previous pass's state: `$rowCount++` dropping the `$values` holders
guarded by `$rowCount` replaced the final walk's `$values` holders with the
pass's, such as `$cols` int<1, max> implying `$values` is array{0?: ...}.
The while loop's merge with its not-ran path then kept that holder, and
`$col = 0` in a later for loop narrowed `$values` to array{0?: ...}.
Such an expression now keeps only its current holders that the recorded
walk kept too.
Amp-Thread-ID: https://ampcode.com/threads/T-01a1deb9-7acb-72e2-bab8-0404b371a0211 parent c2f6bd9 commit 4a6443d
4 files changed
Lines changed: 140 additions & 16 deletions
File tree
- src/Analyser
- tests/PHPStan/Analyser
- data
- turbo-ext/src
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
106 | 106 | | |
107 | 107 | | |
108 | 108 | | |
| 109 | + | |
109 | 110 | | |
110 | 111 | | |
111 | 112 | | |
| |||
1515 | 1516 | | |
1516 | 1517 | | |
1517 | 1518 | | |
1518 | | - | |
1519 | | - | |
| 1519 | + | |
| 1520 | + | |
| 1521 | + | |
| 1522 | + | |
1520 | 1523 | | |
1521 | 1524 | | |
1522 | | - | |
1523 | | - | |
1524 | | - | |
1525 | | - | |
| 1525 | + | |
| 1526 | + | |
| 1527 | + | |
| 1528 | + | |
| 1529 | + | |
| 1530 | + | |
| 1531 | + | |
| 1532 | + | |
| 1533 | + | |
| 1534 | + | |
1526 | 1535 | | |
1527 | 1536 | | |
1528 | | - | |
| 1537 | + | |
1529 | 1538 | | |
1530 | 1539 | | |
1531 | 1540 | | |
| |||
| 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 | + | |
| 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 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2996 | 2996 | | |
2997 | 2997 | | |
2998 | 2998 | | |
| 2999 | + | |
| 3000 | + | |
| 3001 | + | |
| 3002 | + | |
| 3003 | + | |
| 3004 | + | |
| 3005 | + | |
| 3006 | + | |
| 3007 | + | |
| 3008 | + | |
| 3009 | + | |
| 3010 | + | |
| 3011 | + | |
| 3012 | + | |
| 3013 | + | |
| 3014 | + | |
| 3015 | + | |
| 3016 | + | |
| 3017 | + | |
| 3018 | + | |
| 3019 | + | |
| 3020 | + | |
| 3021 | + | |
| 3022 | + | |
| 3023 | + | |
| 3024 | + | |
| 3025 | + | |
| 3026 | + | |
| 3027 | + | |
| 3028 | + | |
| 3029 | + | |
| 3030 | + | |
| 3031 | + | |
| 3032 | + | |
| 3033 | + | |
| 3034 | + | |
2999 | 3035 | | |
3000 | 3036 | | |
3001 | 3037 | | |
| |||
3009 | 3045 | | |
3010 | 3046 | | |
3011 | 3047 | | |
| 3048 | + | |
| 3049 | + | |
3012 | 3050 | | |
3013 | | - | |
3014 | | - | |
3015 | | - | |
3016 | | - | |
3017 | | - | |
3018 | | - | |
| 3051 | + | |
3019 | 3052 | | |
3020 | 3053 | | |
3021 | | - | |
3022 | | - | |
3023 | | - | |
| 3054 | + | |
| 3055 | + | |
3024 | 3056 | | |
3025 | 3057 | | |
3026 | 3058 | | |
| |||
0 commit comments