Skip to content

Commit c01c96e

Browse files
committed
Re-enable parallel pickling
1 parent 41d3369 commit c01c96e

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

compiler/src/dotty/tools/dotc/transform/Pickler.scala

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ import scala.concurrent.duration.Duration
1818

1919
object Pickler {
2020
val name: String = "pickler"
21+
22+
/** If set, perform jump target compacting, position and comment pickling,
23+
* as well as final assembly in parallel with downstream phases; force
24+
* only in backend.
25+
*/
26+
inline val ParallelPickling = true
2127
}
2228

2329
/** This phase pickles trees */
@@ -94,15 +100,7 @@ class Pickler extends Phase {
94100
positionWarnings.foreach(report.warning(_))
95101
result
96102

97-
// Turn off parallelism because it lead to non-deterministic CI failures:
98-
// - https://github.com/lampepfl/dotty/runs/1029579877?check_suite_focus=true#step:10:967
99-
// - https://github.com/lampepfl/dotty/runs/1027582846?check_suite_focus=true#step:10:564
100-
//
101-
// Turning off parallelism in -Ytest-pickler and Interactive mode seems to
102-
// work around the problem but I would prefer to not enable this at all
103-
// until the root cause of the issue is understood since it might manifest
104-
// itself in other situations too.
105-
if !ctx.settings.YparallelPickler.value then force()
103+
if !Pickler.ParallelPickling then force()
106104

107105
unit.pickled += (cls -> force)
108106
end for

0 commit comments

Comments
 (0)