Don't use js.Map in ClassValue when targeting pure Wasm

.github/workflows/ci.yml

@@ -81,7 +81,7 @@ jobs:
         esVersion: [ES2015, ES2021] # Some javalib features depend on the target ES version
         eh-support: [true, false]
     env:
-      SBT_SET_COMMAND: 'set Seq(Global/enableWasmEverywhere := true, ThisBuild/scalaJSLinkerConfig ~= (_.withESFeatures(_.withESVersion(ESVersion.${{ matrix.esVersion }})).withWasmFeatures(_.withTargetPureWasm(true).withExceptionHandling(${{ matrix.eh-support }}))))'
+      SBT_SET_COMMAND: 'set Seq(Global/enableWasmEverywhere := true, ThisBuild/scalaJSLinkerConfig ~= (_.withESFeatures(_.withESVersion(ESVersion.${{ matrix.esVersion }})).withModuleKind(ModuleKind.MinimalWasmModule).withWasmFeatures(_.withExceptionHandling(${{ matrix.eh-support }}))))'
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4

README.md

@@ -24,7 +24,7 @@ This is a friendly fork of Scala.js, targeting stand-alone Wasm runtimes such as
 ### `test-suite`
 ```sh
 sbt:Scala.js> set Global/enableWasmEverywhere := true
-sbt:Scala.js> set scalaJSLinkerConfig in testSuite.v2_12 ~= (_.withWasmFeatures(_.withTargetPureWasm(true)))
+sbt:Scala.js> set scalaJSLinkerConfig in testSuite.v2_12 ~= (_.withModuleKind(ModuleKind.MinimalWasmModule))
 sbt:Scala.js> testSuite2_12/test
 ```
 

ir/shared/src/main/scala/org/scalajs/ir/Serializers.scala

@@ -30,8 +30,7 @@ import LinkTimeProperty.{
   ESVersion,
   UseECMAScript2015Semantics,
   IsWebAssembly,
-  LinkerVersion,
-  TargetPureWasm
+  LinkerVersion
 }
 import Types._
 import Tags._
@@ -1590,8 +1589,6 @@ object Serializers {
                 LinkTimeProperty(LinkerVersion)(StringType)
               case StringLiteral("fileLevelThis") =>
                 JSGlobalRef(JSGlobalRef.FileLevelThis)
-              case StringLiteral("targetPureWasm") =>
-                LinkTimeProperty(TargetPureWasm)(BooleanType)
               case otherItem =>
                 JSSelect(jsLinkingInfo, otherItem)
             }
@@ -1628,8 +1625,7 @@ object Serializers {
                   LinkTimeProperty(UseECMAScript2015Semantics)(BooleanType)),
               (StringLiteral("isWebAssembly"), LinkTimeProperty(IsWebAssembly)(BooleanType)),
               (StringLiteral("linkerVersion"), LinkTimeProperty(LinkerVersion)(StringType)),
-              (StringLiteral("fileLevelThis"), JSGlobalRef(JSGlobalRef.FileLevelThis)),
-              (StringLiteral("targetPureWasm"), LinkTimeProperty(TargetPureWasm)(BooleanType))
+              (StringLiteral("fileLevelThis"), JSGlobalRef(JSGlobalRef.FileLevelThis))
             ))
           } else {
             throw new IOException(

ir/shared/src/main/scala/org/scalajs/ir/Trees.scala

@@ -1324,9 +1324,9 @@ object Trees {
     final val ProductionMode = "core/productionMode"
     final val ESVersion = "core/esVersion"
     final val UseECMAScript2015Semantics = "core/useECMAScript2015Semantics"
+    final val ModuleKind = "core/moduleKind"
     final val IsWebAssembly = "core/isWebAssembly"
     final val LinkerVersion = "core/linkerVersion"
-    final val TargetPureWasm = "core/targetPureWasm"
   }
 
   // Atomic expressions

javalib/src/main/scala/java/io/CharArrayReader.scala

@@ -48,14 +48,16 @@ class CharArrayReader(protected var buf: Array[Char], offset: Int, length: Int)
 
   override def read(buffer: Array[Char], offset: Int, len: Int): Int = {
     if (offset < 0 || offset > buffer.length)
-      throw new ArrayIndexOutOfBoundsException("Offset out of bounds : " + offset)
+      throw new IndexOutOfBoundsException("Offset out of bounds : " + offset)
 
     if (len < 0 || len > buffer.length - offset)
-      throw new ArrayIndexOutOfBoundsException("Length out of bounds : " + len)
+      throw new IndexOutOfBoundsException("Length out of bounds : " + len)
 
     ensureOpen()
 
-    if (this.pos < this.count) {
+    if (len == 0) {
+      0
+    } else if (this.pos < this.count) {
       val bytesRead = Math.min(len, this.count - this.pos)
       System.arraycopy(this.buf, this.pos, buffer, offset, bytesRead)
       this.pos += bytesRead

javalib/src/main/scala/java/io/CharArrayWriter.scala

@@ -58,7 +58,7 @@ class CharArrayWriter(initialSize: Int) extends Writer {
 
   override def write(str: String, offset: Int, len: Int): Unit = {
     if (offset < 0 || offset > str.length || len < 0 || len > str.length - offset)
-      throw new StringIndexOutOfBoundsException
+      throw new IndexOutOfBoundsException
 
     ensureCapacity(len)
     str.getChars(offset, offset + len, this.buf, this.count)

javalib/src/main/scala/java/io/InputStream.scala

@@ -75,7 +75,7 @@ abstract class InputStream extends Closeable {
            * - len <= Integer.MAX_VALUE (because of its type)
            */
           val newLen =
-            if (Integer.MAX_VALUE / 2 > buf.length) Integer.MAX_VALUE
+            if (buf.length > Integer.MAX_VALUE / 2) Integer.MAX_VALUE
             else buf.length * 2
           buf = Arrays.copyOf(buf, Math.min(len, newLen))
         }

javalib/src/main/scala/java/lang/Character.scala

@@ -21,7 +21,8 @@ import scala.annotation.{tailrec, switch}
 
 import scala.scalajs.js
 import scala.scalajs.LinkingInfo
-import scala.scalajs.LinkingInfo.ESVersion
+import scala.scalajs.LinkingInfo.{ESVersion, moduleKind}
+import scala.scalajs.LinkingInfo.ModuleKind.{MinimalWasmModule, WasmComponent}
 
 import java.lang.constant.Constable
 import java.util.{ArrayList, Arrays, HashMap}
@@ -132,7 +133,7 @@ object Character {
     if (!isValidCodePoint(codePoint))
       throw new IllegalArgumentException()
 
-    LinkingInfo.linkTimeIf(LinkingInfo.targetPureWasm) {
+    LinkingInfo.linkTimeIf(moduleKind == MinimalWasmModule || moduleKind == WasmComponent) {
       if (isBmpCodePoint(codePoint)) {
         Character.toString(codePoint.toChar)
       } else {
@@ -723,7 +724,7 @@ object Character {
       case _ =>
         // In WASI implementation, we cannot use String#toUpperCase
         // since it uses Character#toUpperCase.
-        LinkingInfo.linkTimeIf(LinkingInfo.targetPureWasm) {
+        LinkingInfo.linkTimeIf(moduleKind == MinimalWasmModule || moduleKind == WasmComponent) {
           import CaseUtil._
           toCase(codePoint, a, z, lowerBeta, lowerRanges, lowerDeltas, lowerSteps)
         } {
@@ -752,7 +753,7 @@ object Character {
       case 0x0130 =>
         0x0069 // İ => i
       case _ =>
-        LinkingInfo.linkTimeIf(LinkingInfo.targetPureWasm) {
+        LinkingInfo.linkTimeIf(moduleKind == MinimalWasmModule || moduleKind == WasmComponent) {
           // in pure Wasm implementation, we cannot use String#toLowerCase
           // since it uses Character$toLowerCase
           import CaseUtil._

javalib/src/main/scala/java/lang/ClassValue.scala

@@ -17,16 +17,24 @@ import java.util.HashMap
 import scala.scalajs.js
 import scala.scalajs.js.annotation._
 import scala.scalajs.LinkingInfo
-import scala.scalajs.LinkingInfo.ESVersion
+import scala.scalajs.LinkingInfo.{ESVersion, moduleKind}
+import scala.scalajs.LinkingInfo.ModuleKind.{MinimalWasmModule, WasmComponent}
 
 import Utils._
 
 abstract class ClassValue[T] protected () {
   private val jsMap: js.Map[Class[_], T] = {
-    if (LinkingInfo.esVersion >= ESVersion.ES2015 || js.typeOf(js.Dynamic.global.Map) != "undefined")
-      new js.Map()
-    else
+    LinkingInfo.linkTimeIf[js.Map[Class[_], T]](
+        moduleKind == MinimalWasmModule || moduleKind == WasmComponent) {
       null
+    } {
+      if (LinkingInfo.esVersion >= ESVersion.ES2015 ||
+          js.typeOf(js.Dynamic.global.Map) != "undefined") {
+        new js.Map()
+      } else {
+        null
+      }
+    }
   }
 
   @inline
@@ -35,7 +43,11 @@ abstract class ClassValue[T] protected () {
      * emitting ES 2015 code, which allows to dead-code-eliminate the branches
      * using `HashMap`s, and therefore `HashMap` itself.
      */
-    LinkingInfo.esVersion >= ESVersion.ES2015 || jsMap != null
+    LinkingInfo.linkTimeIf(moduleKind == MinimalWasmModule || moduleKind == WasmComponent) {
+      false
+    } {
+      LinkingInfo.esVersion >= ESVersion.ES2015 || jsMap != null
+    }
   }
 
   /* We use a HashMap instead of an IdentityHashMap because the latter is
@@ -49,35 +61,47 @@ abstract class ClassValue[T] protected () {
   protected def computeValue(`type`: Class[_]): T
 
   def get(`type`: Class[_]): T = {
-    if (useJSMap) {
-      mapGetOrElseUpdate(jsMap, `type`)(() => computeValue(`type`))
-    } else {
-      /* We first perform `get`, and if the result is null, we use
-       * `containsKey` to disambiguate a present null from an absent key.
-       * Since the purpose of ClassValue is to be used a cache indexed by Class
-       * values, the expected use case will have more hits than misses, and so
-       * this ordering should be faster on average than first performing `has`
-       * then `get`.
-       */
-      javaMap.get(`type`) match {
-        case null =>
-          if (javaMap.containsKey(`type`)) {
-            null.asInstanceOf[T]
-          } else {
-            val newValue = computeValue(`type`)
-            javaMap.put(`type`, newValue)
-            newValue
-          }
-        case value =>
-          value
+    LinkingInfo.linkTimeIf(moduleKind == MinimalWasmModule || moduleKind == WasmComponent) {
+      getJavaMap(`type`)
+    } {
+      if (useJSMap) {
+        mapGetOrElseUpdate(jsMap, `type`)(() => computeValue(`type`))
+      } else {
+        getJavaMap(`type`)
       }
     }
   }
 
+  private def getJavaMap(`type`: Class[_]): T = {
+    /* We first perform `get`, and if the result is null, we use
+     * `containsKey` to disambiguate a present null from an absent key.
+     * Since the purpose of ClassValue is to be used a cache indexed by Class
+     * values, the expected use case will have more hits than misses, and so
+     * this ordering should be faster on average than first performing `has`
+     * then `get`.
+     */
+    javaMap.get(`type`) match {
+      case null =>
+        if (javaMap.containsKey(`type`)) {
+          null.asInstanceOf[T]
+        } else {
+          val newValue = computeValue(`type`)
+          javaMap.put(`type`, newValue)
+          newValue
+        }
+      case value =>
+        value
+    }
+  }
+
   def remove(`type`: Class[_]): Unit = {
-    if (useJSMap)
-      jsMap.delete(`type`)
-    else
+    LinkingInfo.linkTimeIf[Unit](moduleKind == MinimalWasmModule || moduleKind == WasmComponent) {
       javaMap.remove(`type`)
+    } {
+      if (useJSMap)
+        jsMap.delete(`type`)
+      else
+        javaMap.remove(`type`)
+    }
   }
 }

javalib/src/main/scala/java/lang/Double.scala

@@ -17,7 +17,8 @@ import java.util.regex.RegExpImpl
 
 import scala.scalajs.js
 import scala.scalajs.LinkingInfo
-import scala.scalajs.LinkingInfo.linkTimeIf
+import scala.scalajs.LinkingInfo.{linkTimeIf, moduleKind}
+import scala.scalajs.LinkingInfo.ModuleKind.{MinimalWasmModule, WasmComponent}
 
 import Utils._
 
@@ -127,7 +128,7 @@ object Double {
     import RegExpImpl.impl
     val groups = impl.exec(doubleStrPat, s)
     if (impl.matches(groups)) {
-      linkTimeIf(LinkingInfo.targetPureWasm) {
+      linkTimeIf(moduleKind == MinimalWasmModule || moduleKind == WasmComponent) {
         parseDoubleWasm(s, groups)
       } {
         js.Dynamic.global.parseFloat(impl.get(groups, 1)).asInstanceOf[scala.Double]
@@ -289,7 +290,7 @@ object Double {
     @inline def nativeParseInt(s: String, radix: Int): scala.Double =
       js.Dynamic.global.parseInt(s, radix).asInstanceOf[scala.Double]
 
-    val mantissa = linkTimeIf(LinkingInfo.targetPureWasm) {
+    val mantissa = linkTimeIf(moduleKind == MinimalWasmModule || moduleKind == WasmComponent) {
       val mantissaLong = Long.parseUnsignedLong(truncatedMantissaStr, 16)
       // convert unsigned long to double
       (mantissaLong >>> 32).toDouble * (1L << 32) + (mantissaLong & 0xffffffffL).toDouble
@@ -298,7 +299,7 @@ object Double {
     }
     // Assert: mantissa != 0.0 && mantissa != scala.Double.PositiveInfinity
 
-    val binaryExp = linkTimeIf(LinkingInfo.targetPureWasm) {
+    val binaryExp = linkTimeIf(moduleKind == MinimalWasmModule || moduleKind == WasmComponent) {
       if (binaryExpStr.length() > 11) {
         if (binaryExpStr.charAt(0) == '-') Int.MinValue
         else Int.MaxValue

javalib/src/main/scala/java/lang/Float.scala

@@ -16,7 +16,9 @@ import java.lang.constant.{Constable, ConstantDesc}
 import java.util.regex.{Matcher, Pattern, RegExpImpl}
 
 import scala.scalajs.js
-import scala.scalajs.LinkingInfo._
+import scala.scalajs.LinkingInfo
+import scala.scalajs.LinkingInfo.{ESVersion, esVersion, linkTimeIf, moduleKind}
+import scala.scalajs.LinkingInfo.ModuleKind.{MinimalWasmModule, WasmComponent}
 
 /* This is a hijacked class. Its instances are primitive numbers.
  * Constructors are not emitted.
@@ -150,7 +152,7 @@ object Float {
   private def parseFloatDecimal(fullNumberStr: String,
       integralPartStr: String, fractionalPartStr: String,
       exponentStr: String): scala.Float = {
-    linkTimeIf[scala.Float](targetPureWasm) {
+    linkTimeIf[scala.Float](moduleKind == MinimalWasmModule || moduleKind == WasmComponent) {
       parseFloatDecimalWasm(fullNumberStr, integralPartStr, fractionalPartStr, exponentStr)
     } {
       parseFloatDecimalJS(fullNumberStr, integralPartStr, fractionalPartStr, exponentStr)

javalib/src/main/scala/java/lang/Integer.scala

@@ -17,7 +17,8 @@ import java.util.function._
 
 import scala.scalajs.js
 import scala.scalajs.LinkingInfo
-import scala.scalajs.LinkingInfo.ESVersion
+import scala.scalajs.LinkingInfo.{ESVersion, moduleKind}
+import scala.scalajs.LinkingInfo.ModuleKind.{MinimalWasmModule, WasmComponent}
 
 /* This is a hijacked class. Its instances are primitive numbers.
  * Constructors are not emitted.
@@ -339,7 +340,7 @@ object Integer {
   @inline def min(a: Int, b: Int): Int = Math.min(a, b)
 
   @inline private[this] def toStringBase(i: scala.Int, base: scala.Int): String = {
-    LinkingInfo.linkTimeIf(LinkingInfo.targetPureWasm) {
+    LinkingInfo.linkTimeIf(moduleKind == MinimalWasmModule || moduleKind == WasmComponent) {
       toStringWasmGenericImpl(i, base, false)
     } {
       import js.JSNumberOps.enableJSNumberOps