Skip to content

Fix #4073: erase <repeted> type from lifted val for a vararg #4086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 13, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions compiler/src/dotty/tools/dotc/core/TypeErasure.scala
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,7 @@ 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) {
val seqClass = if (isJava) defn.ArrayClass else defn.SeqClass
tp.translateParameterized(defn.RepeatedParamClass, seqClass)
}
else tp
val normTp = tp.underlyingIfRepeated(isJava)
val erase = erasureFn(isJava, semiEraseVCs = false, isConstructor = false, wildcardOK = true)
erase.sigName(normTp)(erasureCtx)
}
Expand Down Expand Up @@ -394,6 +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(tp.underlyingIfRepeated(isJava))
else apply(tp.superType)
case _: TermRef | _: ThisType =>
this(tp.widen)
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
18 changes: 18 additions & 0 deletions tests/Foo.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import scala.language.dynamics

class DynImpl extends Dynamic {
def applyDynamic(name: String)(args: Any*)(implicit implicitArg: String = "foo"): String =
s"method '$name' called with arguments ${args.mkString("'", "', '", "'")} and implicit argument '$implicitArg'"
}

object Main {
def main(args:Array[String]): Unit = {
val d = new DynImpl

println(d.some())

println(d.ints(1, 2, 3))

println(d.strings("a", "b", "c"))
}
}
3 changes: 3 additions & 0 deletions tests/run/i4073.check
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
method 'some' called with arguments '' and implicit argument 'foo'
method 'ints' called with arguments '1', '2', '3' and implicit argument 'foo'
method 'strings' called with arguments 'a', 'b', 'c' and implicit argument 'foo'
18 changes: 18 additions & 0 deletions tests/run/i4073.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import scala.language.dynamics

class DynImpl extends Dynamic {
def applyDynamic(name: String)(args: Any*)(implicit implicitArg: String = "foo"): String =
s"method '$name' called with arguments ${args.mkString("'", "', '", "'")} and implicit argument '$implicitArg'"
}

object Test {
def main(args:Array[String]): Unit = {
val d = new DynImpl

println(d.some())

println(d.ints(1, 2, 3))

println(d.strings("a", "b", "c"))
}
}
1 change: 1 addition & 0 deletions tests/run/i4073b.check
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
foo123
4 changes: 4 additions & 0 deletions tests/run/i4073b.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
object Test {
def main(args:Array[String]): Unit = println(foo(1, 2, 3)())
def foo(args: Any*)(arg: String = "foo"): String = arg + args.mkString("")
}
1 change: 1 addition & 0 deletions tests/run/i4073c.check
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
foo123
4 changes: 4 additions & 0 deletions tests/run/i4073c.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
object Test {
def main(args:Array[String]): Unit = println(foo(1, 2, 3)())
def foo(args: Int*)(arg: String = "foo"): String = arg + args.mkString("")
}