Commit 2c25b88
committed
Avoid cycles when unpickling the stdlib from TASTY
`adjustForTuple` shouldn't be used when unpickling Java (because the
Tuple classes are always defined in .scala files) nor when unpickling
TASTY (because at that point, `adjustForTuple` has already been called
by Namer before pickling). This avoids some cycles when unpickling
the standard library from TASTY (we don't have a published
Dotty-compiled standard library yet, but trying to use incremental
compilation in the stdlib that is part of our community build is enough
to trigger the issue).
Note: This won't handle the hypothetical future case of Scala 2
generated TASTY files which wouldn't have the extra parents, but let's not
worry about that for now.1 parent d8ddbf7 commit 2c25b88
File tree
3 files changed
+9
-7
lines changed- compiler/src/dotty/tools/dotc/core
- classfile
- tasty
- unpickleScala2
3 files changed
+9
-7
lines changedLines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
171 | 171 | | |
172 | 172 | | |
173 | 173 | | |
174 | | - | |
175 | | - | |
| 174 | + | |
| 175 | + | |
176 | 176 | | |
177 | 177 | | |
178 | 178 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
893 | 893 | | |
894 | 894 | | |
895 | 895 | | |
896 | | - | |
| 896 | + | |
897 | 897 | | |
898 | 898 | | |
899 | 899 | | |
| |||
Lines changed: 6 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
91 | 91 | | |
92 | 92 | | |
93 | 93 | | |
94 | | - | |
| 94 | + | |
95 | 95 | | |
96 | 96 | | |
97 | 97 | | |
| |||
106 | 106 | | |
107 | 107 | | |
108 | 108 | | |
| 109 | + | |
| 110 | + | |
109 | 111 | | |
110 | | - | |
111 | | - | |
| 112 | + | |
| 113 | + | |
112 | 114 | | |
113 | 115 | | |
114 | 116 | | |
| |||
553 | 555 | | |
554 | 556 | | |
555 | 557 | | |
556 | | - | |
| 558 | + | |
557 | 559 | | |
558 | 560 | | |
559 | 561 | | |
| |||
0 commit comments