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.

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

Fix #15494: Handle non-specialized functions in EtaReduce. #15498

Merged
merged 1 commit into from
Jun 22, 2022
Merged

Fix #15494: Handle non-specialized functions in EtaReduce. #15498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions compiler/src/dotty/tools/dotc/transform/EtaReduce.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ class EtaReduce extends MiniPhase:
fn
case TypeApply(Select(qual, _), _) if rhs.symbol.isTypeCast && rhs.span.isSynthetic =>
tryReduce(mdef, qual)
case Apply(_, arg :: Nil) if Erasure.Boxing.isUnbox(rhs.symbol) && rhs.span.isSynthetic =>
tryReduce(mdef, arg)
case Block(call :: Nil, unit @ Literal(Constants.Constant(()))) if unit.span.isSynthetic =>
tryReduce(mdef, call)
case _ =>
tree

Expand Down
19 changes: 19 additions & 0 deletions tests/sjs-junit/test/org/scalajs/testsuite/compiler/RegressionTestScala3.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,25 @@ class RegressionTestScala3 {
assertEquals(0L, Foo.bar().x)
assertEquals(5L, Foo.bar(5L).x)
}

@Test def etaReduceIssue15494(): Unit = {
// Also known as tests/run/i14623.scala for Scala/JVM

object Thunk {
private[this] val impl =
((x: Any) => x).asInstanceOf[(=> Any) => Function0[Any]]

def asFunction0[A](thunk: => A): Function0[A] = impl(thunk).asInstanceOf[Function0[A]]
}

var i = 0
val f1 = { () => i += 1; "" }
assertSame(f1, Thunk.asFunction0(f1()))
val f2 = { () => i += 1; i }
assertSame(f2, Thunk.asFunction0(f2()))
val f3 = { () => i += 1 }
assertSame(f3, Thunk.asFunction0(f3()))
}
}

object RegressionTestScala3 {
Expand Down