Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix #5231: Partial revert of "Fail if we cannot inline RuntimeLong". #5232

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 1 commit into from
Sep 5, 2025
Merged

Fix #5231: Partial revert of "Fail if we cannot inline RuntimeLong". #5232

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
13 changes: 5 additions & 8 deletions linker/shared/src/main/scala/org/scalajs/linker/frontend/optimizer/OptimizerCore.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3617,14 +3617,11 @@ private[optimizer] abstract class OptimizerCore(
implicit val scope = scope1
val tRef = VarRef(tName)(rtLongClassType)

val lo = Apply(ApplyFlags.empty, tRef, MethodIdent(LongImpl.lo), Nil)(IntType)
val hi = Apply(ApplyFlags.empty, tRef, MethodIdent(LongImpl.hi), Nil)(IntType)

pretransformExprs(lo, hi) { (tlo, thi) =>
inlineClassConstructor(AllocationSite.Anonymous, LongImpl.RuntimeLongClass,
inlinedRTLongStructure, MethodIdent(LongImpl.initFromParts), List(tlo, thi),
() => throw new AssertionError(s"rolled-back RuntimeLong inlining at $pos"))(cont1)
}
val newTree = New(LongImpl.RuntimeLongClass,
MethodIdent(LongImpl.initFromParts),
List(Apply(ApplyFlags.empty, tRef, MethodIdent(LongImpl.lo), Nil)(IntType),
Apply(ApplyFlags.empty, tRef, MethodIdent(LongImpl.hi), Nil)(IntType)))
pretransformExpr(newTree)(cont1)
} (cont)
}

Expand Down
22 changes: 22 additions & 0 deletions test-suite/js/src/test/scala/org/scalajs/testsuite/compiler/OptimizerTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,28 @@ class OptimizerTest {

assertTrue(called)
}

@Test def expandedRTAssertionOriginal_Issue5231(): Unit = {
def expandedRTLongBug: (Array[Int], Long) => Long = { (array, z) =>
array.foldRight(z)(_ - _)
}

assertEquals(-3L, expandedRTLongBug(Array(1, 2, 3), 5L))
}

@Test def expandedRTAssertionMinimal_Issue5231(): Unit = {
@noinline def hideLong(x: Long): Long = x
@noinline def hide(x: Any): Any = x

val z0: Long = hideLong(5L)
var i = 0
var z: Any = z0
while (i < 2) {
z = hide(i.toLong)
i += 1
}
assertEquals(1L, z)
}
}

object OptimizerTest {
Expand Down
Loading