Fix ElimRepeated not transforming modifiers in tree.

2 files changed, 6 insertions, 3 deletions

diff --git a/src/dotty/tools/dotc/core/pickling/UnPickler.scala b/src/dotty/tools/dotc/core/pickling/UnPickler.scala
index fd752b534..c503f447b 100644
--- a/src/dotty/tools/dotc/core/pickling/UnPickler.scala
+++ b/src/dotty/tools/dotc/core/pickling/UnPickler.scala
@@ -831,7 +831,7 @@ class UnPickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClassRoot:
       }
       t.toList
     }
-    println(atp)
+    // println(atp)
     val typer = ctx.typer
     val proto = new FunProtoTyped(args, atp, typer)
     val alts = atp.member(nme.CONSTRUCTOR).alternatives.map(_.termRef)
diff --git a/src/dotty/tools/dotc/transform/ElimRepeated.scala b/src/dotty/tools/dotc/transform/ElimRepeated.scala
index ba2de659f..8bb2bdedf 100644
--- a/src/dotty/tools/dotc/transform/ElimRepeated.scala
+++ b/src/dotty/tools/dotc/transform/ElimRepeated.scala
@@ -94,10 +94,13 @@ class ElimRepeated extends MiniPhaseTransform with InfoTransformer { thisTransfo
   override def transformDefDef(tree: DefDef)(implicit ctx: Context, info: TransformerInfo): Tree = {
     assert(ctx.phase == thisTransformer)
     def overridesJava = tree.symbol.allOverriddenSymbols.exists(_ is JavaDefined)
+    val newAnnots = tree.mods.annotations.mapConserve(annotTransformer.transform)
+    val newTree = if (newAnnots eq tree.mods.annotations) tree
+      else cpy.DefDef(tree)(mods  = Modifiers(tree.mods.flags, tree.mods.privateWithin, newAnnots))
     if (tree.symbol.info.isVarArgsMethod && overridesJava)
-      addVarArgsBridge(tree)(ctx.withPhase(thisTransformer.next))
+      addVarArgsBridge(newTree)(ctx.withPhase(thisTransformer.next))
     else
-      tree
+      newTree
   }
 
   /** Add a Java varargs bridge