Skip to content

Commit 1890bc6

Browse files
committed
Place typeSimplifier as a member of Pickling
1 parent eda8859 commit 1890bc6

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ class Pickler extends Phase {
5050
private val beforePickling = new mutable.HashMap[ClassSymbol, String]
5151
private val picklers = new mutable.HashMap[ClassSymbol, TastyPickler]
5252

53+
private val typeSimplifier = new TypeSimplifyTransformer
54+
5355
/** Drop any elements of this list that are linked module classes of other elements in the list */
5456
private def dropCompanionModuleClasses(clss: List[ClassSymbol])(using Context): List[ClassSymbol] = {
5557
val companionModuleClasses =
@@ -61,8 +63,6 @@ class Pickler extends Phase {
6163
val unit = ctx.compilationUnit
6264
pickling.println(i"unpickling in run ${ctx.runId}")
6365

64-
val typeSimplifier = new TypeSimplifyTransformer
65-
6666
for
6767
cls <- dropCompanionModuleClasses(topLevelClasses(unit.tpdTree))
6868
tree <- sliceTopLevel(unit.tpdTree, cls)
@@ -137,9 +137,6 @@ class Pickler extends Phase {
137137
cls -> unpickler
138138
}
139139
pickling.println("************* entered toplevel ***********")
140-
141-
val typeSimplifier = new TypeSimplifyTransformer
142-
143140
for ((cls, unpickler) <- unpicklers) {
144141
val unpickled = typeSimplifier.transform(unpickler.rootTrees)
145142
testSame(i"$unpickled%\n%", beforePickling(cls), cls)

0 commit comments

Comments
 (0)