Commit 2aa2803
authored
Fix race condition in new LazyVals (#16975)
Resolve #16806
In the repro, `Evaluating` was generated as a subtype of `Serializable`,
and the type of lazy value was erased to `Serializable` - these together
broke the optimized condition checking if the value is initialized. For
lazy val of type `A` we were checking if `LazyValControlState <: A`, and
if that was not the case, we assumed it would be safe to just generate
the condition `_value.isInstanceOf[A]`. If that condition was true in
runtime, we assumed that the value was already calculated and returned
it. If it was `Evaluating` and `A =:= Serializable`, then we assumed so
falsely. The easiest fix is to just make the `LazyValControlState <:
Serializable`, I will check if it doesn't affect performance.File tree
4 files changed
+51
-1
lines changed- library/src/scala/runtime
- project
- tests/run
4 files changed
+51
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | | - | |
| 48 | + | |
| 49 | + | |
49 | 50 | | |
50 | 51 | | |
51 | 52 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
30 | 35 | | |
31 | 36 | | |
32 | 37 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 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 | + | |
0 commit comments