Skip to content

Commit f8a1729

Browse files
authored
Merge pull request #222 from scala/backport-lts-3.3-22797
Backport "Fix scala#22794: Emit the definition of `Arrays.newArray` even though it's a primitive." to 3.3 LTS
2 parents e6a7350 + b646238 commit f8a1729

File tree

5 files changed

+14
-1
lines changed

5 files changed

+14
-1
lines changed

Diff for: compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1496,7 +1496,7 @@ class JSCodeGen()(using genCtx: Context) {
14961496

14971497
def jsParams = params.map(genParamDef(_))
14981498

1499-
if (primitives.isPrimitive(sym)) {
1499+
if (primitives.isPrimitive(sym) && sym != defn.newArrayMethod) {
15001500
None
15011501
} else if (sym.is(Deferred) && currentClassSym.isNonNativeJSClass) {
15021502
// scala-js/#4409: Do not emit abstract methods in non-native JS classes

Diff for: sbt-test/scalajs/backward-compat/build.sbt

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
enablePlugins(ScalaJSPlugin)
2+
3+
scalaVersion := sys.props("plugin.scalaVersion")
4+
5+
libraryDependencies += "org.scalameta" %%% "munit" % "1.0.0-M10"

Diff for: sbt-test/scalajs/backward-compat/project/plugins.sbt

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % sys.props("plugin.scalaJSVersion"))
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
class NewArrayIssue22794Test extends munit.FunSuite {
2+
test("foo") {
3+
assert(2 + 2 == 4)
4+
}
5+
}

Diff for: sbt-test/scalajs/backward-compat/test

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
> test

0 commit comments

Comments
 (0)