Skip to content

Fix #7735: Handle case of seq literals of singleton primitive types #7767

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.

Sign up for GitHub

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 2 commits into from
Jan 6, 2020
Merged

Fix #7735: Handle case of seq literals of singleton primitive types #7767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d075e4
Fix #7735: Handle case of seq literals if singleton primitive types
odersky Dec 15, 2019
c7f4898
Add tests
odersky Dec 15, 2019
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
5 changes: 3 additions & 2 deletions compiler/src/dotty/tools/dotc/ast/tpd.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,10 +453,11 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
* kind for the given element type in `elemTpe`.
*/
def wrapArray(tree: Tree, elemtp: Type)(implicit ctx: Context): Tree =
ref(defn.getWrapVarargsArrayModule)
val wrapper = ref(defn.getWrapVarargsArrayModule)
.select(wrapArrayMethodName(elemtp))
.appliedToTypes(if (elemtp.isPrimitiveValueType) Nil else elemtp :: Nil)
.appliedTo(tree)
val actualElem = wrapper.tpe.widen.firstParamTypes.head
wrapper.appliedTo(tree.ensureConforms(actualElem))

// ------ Creating typed equivalents of trees that exist only in untyped form -------

Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/transform/SeqLiterals.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ class SeqLiterals extends MiniPhase {
val arr = JavaSeqLiteral(tree.elems, tree.elemtpt)
//println(i"trans seq $tree, arr = $arr: ${arr.tpe} ${arr.tpe.elemType}")
val elemtp = tree.elemtpt.tpe
wrapArray(arr, elemtp).withSpan(tree.span)
wrapArray(arr, elemtp).withSpan(tree.span).ensureConforms(tree.tpe)
}
}
2 changes: 2 additions & 0 deletions tests/pos/i7735.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
def foo[A](as: A*): Int = ???
val a = foo[1]()
57 changes: 56 additions & 1 deletion tests/run/toplevel-stale/B_2.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,59 @@ val y3 = {
val x6 = summon[Ordering[(Int, Int, Int, Int, Int, Int)]]
val x7 = summon[Ordering[(Int, Int, Int, Int, Int, Int, Int)]]
val x8 = summon[Ordering[(Int, Int, Int, Int, Int, Int, Int, Int)]]
}
}

val y4 = {
val x1 = summon[Ordering[Int]]
val x2 = summon[Ordering[(Int, Int)]]
val x3 = summon[Ordering[(Int, Int, Int)]]
val x4 = summon[Ordering[(Int, Int, Int, Int)]]
val x5 = summon[Ordering[(Int, Int, Int, Int, Int)]]
val x6 = summon[Ordering[(Int, Int, Int, Int, Int, Int)]]
val x7 = summon[Ordering[(Int, Int, Int, Int, Int, Int, Int)]]
val x8 = summon[Ordering[(Int, Int, Int, Int, Int, Int, Int, Int)]]
}

val y5 = {
val x1 = summon[Ordering[Int]]
val x2 = summon[Ordering[(Int, Int)]]
val x3 = summon[Ordering[(Int, Int, Int)]]
val x4 = summon[Ordering[(Int, Int, Int, Int)]]
val x5 = summon[Ordering[(Int, Int, Int, Int, Int)]]
val x6 = summon[Ordering[(Int, Int, Int, Int, Int, Int)]]
val x7 = summon[Ordering[(Int, Int, Int, Int, Int, Int, Int)]]
val x8 = summon[Ordering[(Int, Int, Int, Int, Int, Int, Int, Int)]]
}

val y6 = {
val x1 = summon[Ordering[Int]]
val x2 = summon[Ordering[(Int, Int)]]
val x3 = summon[Ordering[(Int, Int, Int)]]
val x4 = summon[Ordering[(Int, Int, Int, Int)]]
val x5 = summon[Ordering[(Int, Int, Int, Int, Int)]]
val x6 = summon[Ordering[(Int, Int, Int, Int, Int, Int)]]
val x7 = summon[Ordering[(Int, Int, Int, Int, Int, Int, Int)]]
val x8 = summon[Ordering[(Int, Int, Int, Int, Int, Int, Int, Int)]]
}

val y7 = {
val x1 = summon[Ordering[Int]]
val x2 = summon[Ordering[(Int, Int)]]
val x3 = summon[Ordering[(Int, Int, Int)]]
val x4 = summon[Ordering[(Int, Int, Int, Int)]]
val x5 = summon[Ordering[(Int, Int, Int, Int, Int)]]
val x6 = summon[Ordering[(Int, Int, Int, Int, Int, Int)]]
val x7 = summon[Ordering[(Int, Int, Int, Int, Int, Int, Int)]]
val x8 = summon[Ordering[(Int, Int, Int, Int, Int, Int, Int, Int)]]
}

val y8 = {
val x1 = summon[Ordering[Int]]
val x2 = summon[Ordering[(Int, Int)]]
val x3 = summon[Ordering[(Int, Int, Int)]]
val x4 = summon[Ordering[(Int, Int, Int, Int)]]
val x5 = summon[Ordering[(Int, Int, Int, Int, Int)]]
val x6 = summon[Ordering[(Int, Int, Int, Int, Int, Int)]]
val x7 = summon[Ordering[(Int, Int, Int, Int, Int, Int, Int)]]
val x8 = summon[Ordering[(Int, Int, Int, Int, Int, Int, Int, Int)]]
}