diff options
| author | Martin Odersky <odersky@gmail.com> | 2015-02-12 20:48:16 +0100 |
|---|---|---|
| committer | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2015-03-18 11:11:06 +0100 |
| commit | b1cded37763b0b96b9a8881c2d06f85b4d49884e (patch) | |
| tree | c3a0b3cf63b39209260223073c5e979e33a703fd | |
| parent | 85e992293e3c48074da0bc0a00b11097d3ac9d25 (diff) | |
| download | dotty-b1cded37763b0b96b9a8881c2d06f85b4d49884e.tar.gz dotty-b1cded37763b0b96b9a8881c2d06f85b4d49884e.tar.bz2 dotty-b1cded37763b0b96b9a8881c2d06f85b4d49884e.zip | |
Change scheme of translating array creations new Array(...)
The previous scheme generated too many newGenericArray expressions because
at the time newArray was called, the type arguments were not yet determined.
Furthermore, the type variables somehow did not have the right positions,
which caused them not to be interpolated and led to orphan PolyParams.
The new scheme converts the expression when the length parameter has been supplied
and it fully determines the array type before converting.
| -rw-r--r-- | src/dotty/tools/dotc/typer/Applications.scala | 14 | ||||
| -rw-r--r-- | tests/pos/new-array.scala | 3 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/dotty/tools/dotc/typer/Applications.scala b/src/dotty/tools/dotc/typer/Applications.scala index 47dfe157d..582642325 100644 --- a/src/dotty/tools/dotc/typer/Applications.scala +++ b/src/dotty/tools/dotc/typer/Applications.scala @@ -530,7 +530,7 @@ trait Applications extends Compatibility { self: Typer => if (proto.argsAreTyped) new ApplyToTyped(tree, fun1, funRef, proto.typedArgs, pt) else new ApplyToUntyped(tree, fun1, funRef, proto, pt)(argCtx) val result = app.result - ConstFold(result) + convertNewArray(ConstFold(result)) } { (failedVal, failedState) => val fun2 = tryInsertImplicitOnQualifier(fun1, proto) if (fun1 eq fun2) { @@ -596,14 +596,14 @@ trait Applications extends Compatibility { self: Typer => checkBounds(typedArgs, pt) case _ => } - convertNewArray( - assignType(cpy.TypeApply(tree)(typedFn, typedArgs), typedFn, typedArgs)) + assignType(cpy.TypeApply(tree)(typedFn, typedArgs), typedFn, typedArgs) } - /** Rewrite `new Array[T]` trees to calls of newXYZArray methods. */ - def convertNewArray(tree: Tree)(implicit ctx: Context): Tree = tree match { - case TypeApply(tycon, targs) if tycon.symbol == defn.ArrayConstructor => - newArray(targs.head, tree.pos) + /** Rewrite `new Array[T](....)` trees to calls of newXYZArray methods. */ + def convertNewArray(tree: tpd.Tree)(implicit ctx: Context): tpd.Tree = tree match { + case Apply(TypeApply(tycon, targ :: Nil), args) if tycon.symbol == defn.ArrayConstructor => + fullyDefinedType(tree.tpe, "array", tree.pos) + tpd.cpy.Apply(tree)(newArray(targ, tree.pos), args) case _ => tree } diff --git a/tests/pos/new-array.scala b/tests/pos/new-array.scala index 9deb2330a..98b8345a0 100644 --- a/tests/pos/new-array.scala +++ b/tests/pos/new-array.scala @@ -6,9 +6,10 @@ object Test { val z = new Array[Unit](10) } object Test2 { - val w: Array[String] = new Array(10) + val w: Array[Any] = new Array(10) val x: Array[Int] = new Array(10) def f[T: reflect.ClassTag]: Array[T] = new Array(10) val y: Array[Any] = new Array(10) val z: Array[Unit] = new Array(10) } + |