scala-js · sjrd · Jan 25, 2025 · Dec 29, 2024 · Jan 10, 2025 · Jul 1, 2024
diff --git a/compiler/src/main/scala/org/scalajs/nscplugin/GenJSCode.scala b/compiler/src/main/scala/org/scalajs/nscplugin/GenJSCode.scala
diff --git a/ir/shared/src/main/scala/org/scalajs/ir/Hashers.scala b/ir/shared/src/main/scala/org/scalajs/ir/Hashers.scala
@@ -306,6 +306,23 @@ object Hashers {
           mixMethodIdent(method)
           mixTrees(args)
 
+        case ApplyTypedClosure(flags, fun, args) =>
+          mixTag(TagApplyTypedClosure)
+          mixInt(ApplyFlags.toBits(flags))
+          mixTree(fun)
+          mixTrees(args)
+
+        case NewLambda(descriptor, fun) =>
+          import descriptor._
+          mixTag(TagNewLambda)
+          mixName(superClass)
+          mixNames(interfaces)
+          mixMethodName(methodName)
+          mixTypes(paramTypes)
+          mixType(resultType)
+          mixTree(fun)
+          mixType(tree.tpe)
+
         case UnaryOp(op, lhs) =>
           mixTag(TagUnaryOp)
           mixInt(op)
@@ -506,12 +523,15 @@ object Hashers {
           }
           mixType(tree.tpe)
 
-        case Closure(arrow, captureParams, params, restParam, body, captureValues) =>
+        case Closure(flags, captureParams, params, restParam, resultType, body, captureValues) =>
           mixTag(TagClosure)
-          mixBoolean(arrow)
+          mixByte(ClosureFlags.toBits(flags).toByte)
           mixParamDefs(captureParams)
           mixParamDefs(params)
-          restParam.foreach(mixParamDef(_))
+          if (flags.typed)
+            mixType(resultType)
+          else
+            restParam.foreach(mixParamDef(_))
           mixTree(body)
           mixTrees(captureValues)
 
@@ -572,6 +592,10 @@ object Hashers {
       case typeRef: ArrayTypeRef =>
         mixTag(TagArrayTypeRef)
         mixArrayTypeRef(typeRef)
+      case TransientTypeRef(name) =>
+        mixTag(TagTransientTypeRefHashingOnly)
+        mixName(name)
+        // The `tpe` is intentionally ignored here; see doc of `TransientTypeRef`.
     }
 
     def mixArrayTypeRef(arrayTypeRef: ArrayTypeRef): Unit = {
@@ -604,6 +628,11 @@ object Hashers {
         mixTag(if (nullable) TagArrayType else TagNonNullArrayType)
         mixArrayTypeRef(arrayTypeRef)
 
+      case ClosureType(paramTypes, resultType, nullable) =>
+        mixTag(if (nullable) TagClosureType else TagNonNullClosureType)
+        mixTypes(paramTypes)
+        mixType(resultType)
+
       case RecordType(fields) =>
         mixTag(TagRecordType)
         for (RecordType.Field(name, originalName, tpe, mutable) <- fields) {
@@ -614,6 +643,9 @@ object Hashers {
         }
     }
 
+    def mixTypes(tpes: List[Type]): Unit =
+      tpes.foreach(mixType)
+
     def mixLocalIdent(ident: LocalIdent): Unit = {
       mixPos(ident.pos)
       mixName(ident.name)
@@ -644,6 +676,11 @@ object Hashers {
     def mixName(name: Name): Unit =
       mixBytes(name.encoded.bytes)
 
+    def mixNames(names: List[Name]): Unit = {
+      mixInt(names.size)
+      names.foreach(mixName(_))
+    }
+
     def mixMethodName(name: MethodName): Unit = {
       mixName(name.simpleName)
       mixInt(name.paramTypeRefs.size)

diff --git a/ir/shared/src/main/scala/org/scalajs/ir/Names.scala b/ir/shared/src/main/scala/org/scalajs/ir/Names.scala
@@ -436,6 +436,8 @@ object Names {
             i += 1
           }
           appendTypeRef(base)
+        case TransientTypeRef(name) =>
+          builder.append('t').append(name.nameString)
       }
 
       builder.append(simpleName.nameString)

diff --git a/ir/shared/src/main/scala/org/scalajs/ir/Printers.scala b/ir/shared/src/main/scala/org/scalajs/ir/Printers.scala
@@ -340,6 +340,30 @@ object Printers {
           print(method)
           printArgs(args)
 
+        case ApplyTypedClosure(flags, fun, args) =>
+          print(fun)
+          printArgs(args)
+
+        case NewLambda(descriptor, fun) =>
+          import descriptor._
+          print("<newLambda>(")
+          print(superClass)
+          for (intf <- interfaces) {
+            print(", ")
+            print(intf)
+          }
+          print(", ")
+          print(methodName)
+          for (paramType <- paramTypes) {
+            print(", ")
+            print(paramType)
+          }
+          print(", ")
+          print(resultType)
+          print(", ")
+          print(fun)
+          print(")")
+
         case UnaryOp(op, lhs) =>
           import UnaryOp._
 
@@ -848,8 +872,10 @@ object Printers {
           else
             print(name)
 
-        case Closure(arrow, captureParams, params, restParam, body, captureValues) =>
-          if (arrow)
+        case Closure(flags, captureParams, params, restParam, resultType, body, captureValues) =>
+          if (flags.typed)
+            print("(typed-lambda<")
+          else if (flags.arrow)
             print("(arrow-lambda<")
           else
             print("(lambda<")
@@ -864,7 +890,7 @@ object Printers {
             print(value)
           }
           print(">")
-          printSig(params, restParam, AnyType)
+          printSig(params, restParam, resultType)
           printBlock(body)
           print(')')
 
@@ -1062,6 +1088,8 @@ object Printers {
         print(base)
         for (i <- 1 to dims)
           print("[]")
+      case TransientTypeRef(name) =>
+        print(name)
     }
 
     def print(tpe: Type): Unit = tpe match {
@@ -1091,6 +1119,22 @@ object Printers {
         if (!nullable)
           print("!")
 
+      case ClosureType(paramTypes, resultType, nullable) =>
+        print("((")
+        var first = true
+        for (paramType <- paramTypes) {
+          if (first)
+            first = false
+          else
+            print(", ")
+          print(paramType)
+        }
+        print(") => ")
+        print(resultType)
+        print(')')
+        if (!nullable)
+          print('!')
+
       case RecordType(fields) =>
         print('(')
         var first = true

diff --git a/ir/shared/src/main/scala/org/scalajs/ir/ScalaJSVersions.scala b/ir/shared/src/main/scala/org/scalajs/ir/ScalaJSVersions.scala
@@ -17,8 +17,8 @@ import java.util.concurrent.ConcurrentHashMap
 import scala.util.matching.Regex
 
 object ScalaJSVersions extends VersionChecks(
-    current = "1.18.3-SNAPSHOT",
-    binaryEmitted = "1.18"
+    current = "1.19.0-SNAPSHOT",
+    binaryEmitted = "1.19-SNAPSHOT"
 )
 
 /** Helper class to allow for testing of logic. */