Use underlyingIfRepeated

Author: nicolasstucki

compiler/src/dotty/tools/dotc/core/TypeErasure.scala

@@ -133,17 +133,11 @@ object TypeErasure {
     erasureFn(isJava = false, semiEraseVCs = true, isConstructor = false, wildcardOK = false)(tp)(erasureCtx)
 
   def sigName(tp: Type, isJava: Boolean)(implicit ctx: Context): TypeName = {
-    val normTp = if (tp.isRepeatedParam) repeatedErased(tp, isJava) else tp
+    val normTp = tp.underlyingIfRepeated(isJava)
     val erase = erasureFn(isJava, semiEraseVCs = false, isConstructor = false, wildcardOK = true)
     erase.sigName(normTp)(erasureCtx)
   }
 
-  /** Erases a repeated T* type into Seq[T] or Array[T] */
-  def repeatedErased(tp: Type, isJava: Boolean)(implicit ctx: Context): Type = {
-    val seqClass = if (isJava) defn.ArrayClass else defn.SeqClass
-    tp.translateParameterized(defn.RepeatedParamClass, seqClass)
-  }
-
   /** The erasure of a top-level reference. Differs from normal erasure in that
    *  TermRefs are kept instead of being widened away.
    */
@@ -395,7 +389,7 @@ class TypeErasure(isJava: Boolean, semiEraseVCs: Boolean, isConstructor: Boolean
       else eraseNormalClassRef(tp)
     case tp: AppliedType =>
       if (tp.tycon.isRef(defn.ArrayClass)) eraseArray(tp)
-      else if (tp.isRepeatedParam) apply(repeatedErased(tp, isJava))
+      else if (tp.isRepeatedParam) apply(tp.underlyingIfRepeated(isJava))
       else apply(tp.superType)
     case _: TermRef | _: ThisType =>
       this(tp.widen)

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

@@ -82,7 +82,7 @@ class ElimRepeated extends MiniPhase with InfoTransformer { thisPhase =>
       arg match {
         case arg: Typed if isWildcardStarArg(arg) =>
           if (tree.fun.symbol.is(JavaDefined) && arg.expr.tpe.derivesFrom(defn.SeqClass))
-            seqToArray(arg.expr, formal.translateParameterized(defn.RepeatedParamClass, defn.ArrayClass))
+            seqToArray(arg.expr, formal.underlyingIfRepeated(isJava = true))
           else arg.expr
         case arg => arg
       }