Commit 7b25040
Handle assertion error in TyperState (scala#23665)
explanation seems to be in ProtoTypes.scala:
```scala
// To respect the pre-condition of `mergeConstraintWith` and keep
// `protoTyperState` committable we must ensure that it does not
// contain any type variable which don't already exist in the passed
// TyperState. This is achieved by instantiating any such type
// variable. NOTE: this does not suffice to discard type variables
// in ancestors of `protoTyperState`, if this situation ever
// comes up, an assertion in TyperState will trigger and this code
// will need to be generalized.
```
We should go to the bottom of it and fix the assertion. But before
that's done this PR offers a temporary hack to catch the exception when
it is triggered from a new code path created by PR scala#23532. This should
fix the regression reported in scala#23609. We should leave the issue open as
a reminder that we still need a better fix.
Also: handle crash due to missing span in a migration helper.1 parent 900de77 commit 7b25040
File tree
2 files changed
+18
-5
lines changed- compiler/src/dotty/tools/dotc
- core
- typer
2 files changed
+18
-5
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| 30 | + | |
| 31 | + | |
30 | 32 | | |
31 | 33 | | |
32 | 34 | | |
| |||
42 | 44 | | |
43 | 45 | | |
44 | 46 | | |
45 | | - | |
| 47 | + | |
46 | 48 | | |
47 | 49 | | |
48 | 50 | | |
| |||
268 | 270 | | |
269 | 271 | | |
270 | 272 | | |
271 | | - | |
272 | | - | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
273 | 277 | | |
274 | 278 | | |
275 | 279 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3869 | 3869 | | |
3870 | 3870 | | |
3871 | 3871 | | |
| 3872 | + | |
| 3873 | + | |
| 3874 | + | |
| 3875 | + | |
| 3876 | + | |
| 3877 | + | |
| 3878 | + | |
| 3879 | + | |
| 3880 | + | |
3872 | 3881 | | |
3873 | 3882 | | |
3874 | 3883 | | |
3875 | | - | |
3876 | | - | |
| 3884 | + | |
| 3885 | + | |
3877 | 3886 | | |
3878 | 3887 | | |
3879 | 3888 | | |
| |||
0 commit comments