Skip to content
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

Always rewrite empty List() to Nil #21689

Merged
merged 1 commit into from
Oct 2, 2024
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
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/transform/ArrayApply.scala
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class ArrayApply extends MiniPhase {
tree.args match
// <List or Seq>(a, b, c) ~> new ::(a, new ::(b, new ::(c, Nil))) but only for reference types
case StripAscription(Apply(wrapArrayMeth, List(StripAscription(rest: JavaSeqLiteral)))) :: Nil
if defn.WrapArrayMethods().contains(wrapArrayMeth.symbol) =>
if rest.elems.isEmpty || defn.WrapArrayMethods().contains(wrapArrayMeth.symbol) =>
Some(rest.elems)
case _ => None
else None
Expand Down
36 changes: 36 additions & 0 deletions compiler/test/dotty/tools/backend/jvm/ArrayApplyOptTest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,42 @@ class ArrayApplyOptTest extends DottyBytecodeTest {
}
}

@Test def emptyListApplyAvoidsIntermediateArray =
checkApplyAvoidsIntermediateArray("EmptyList"):
"""import scala.collection.immutable.Nil
|class Foo {
| def meth1: List[String] = List()
| def meth2: List[String] = Nil
|}
""".stripMargin

@Test def emptyRefListApplyAvoidsIntermediateArray =
checkApplyAvoidsIntermediateArray("EmptyListOfRef"):
"""import scala.collection.immutable.Nil
|class Foo {
| def meth1: List[String] = List[String]()
| def meth2: List[String] = Nil
|}
""".stripMargin

@Test def emptyPrimitiveListApplyAvoidsIntermediateArray =
checkApplyAvoidsIntermediateArray("EmptyListOfInt"):
"""import scala.collection.immutable.Nil
|class Foo {
| def meth1: List[Int] = List()
| def meth2: List[Int] = Nil
|}
""".stripMargin

@Test def primitiveListApplyAvoidsIntermediateArray =
checkApplyAvoidsIntermediateArray("ListOfInt"):
"""import scala.collection.immutable.{ ::, Nil }
|class Foo {
| def meth1: List[Int] = List(1, 2, 3)
| def meth2: List[Int] = new ::(1, new ::(2, new ::(3, Nil)))
|}
""".stripMargin

@Test def testListApplyAvoidsIntermediateArray = {
checkApplyAvoidsIntermediateArray("List"):
"""import scala.collection.immutable.{ ::, Nil }
Expand Down
Loading