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

Skip to content

Introduce NewLambda to synthesize instances of SAM types. #5003

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 2 commits into from
Mar 16, 2025
Merged

Introduce NewLambda to synthesize instances of SAM types. #5003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a05348
Bump the IR version to 1.19-SNAPSHOT for the upcoming changes.
sjrd Jan 10, 2025
53dc4fe
Introduce NewLambda to synthesize instances of SAM types.
sjrd Jul 1, 2024
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
338 changes: 224 additions & 114 deletions compiler/src/main/scala/org/scalajs/nscplugin/GenJSCode.scala
View file
Open in desktop

Large diffs are not rendered by default.

49 changes: 46 additions & 3 deletions ir/shared/src/main/scala/org/scalajs/ir/Hashers.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,24 @@ 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) =>
val NewLambda.Descriptor(superClass, interfaces, methodName, paramTypes, resultType) =
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)
Expand Down Expand Up @@ -506,12 +524,20 @@ 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) {
if (restParam.isDefined)
throw new InvalidIRException(tree, "Cannot hash a typed closure with a rest param")
mixType(resultType)
} else {
if (resultType != AnyType)
throw new InvalidIRException(tree, "Cannot hash a JS closure with a result type != AnyType")
restParam.foreach(mixParamDef(_))
}
mixTree(body)
mixTrees(captureValues)

Expand Down Expand Up @@ -572,6 +598,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 = {
Expand Down Expand Up @@ -604,6 +634,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) {
Expand All @@ -614,6 +649,9 @@ object Hashers {
}
}

def mixTypes(tpes: List[Type]): Unit =
tpes.foreach(mixType)

def mixLocalIdent(ident: LocalIdent): Unit = {
mixPos(ident.pos)
mixName(ident.name)
Expand Down Expand Up @@ -644,6 +682,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)
Expand Down
11 changes: 9 additions & 2 deletions ir/shared/src/main/scala/org/scalajs/ir/InvalidIRException.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,12 @@

package org.scalajs.ir

class InvalidIRException(val tree: Trees.IRNode, message: String)
extends Exception(message)
class InvalidIRException(val optTree: Option[Trees.IRNode], message: String)
extends Exception(message) {

def this(tree: Trees.IRNode, message: String) =
this(Some(tree), message)

def this(message: String) =
this(None, message)
}
2 changes: 2 additions & 0 deletions ir/shared/src/main/scala/org/scalajs/ir/Names.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,8 @@ object Names {
i += 1
}
appendTypeRef(base)
case TransientTypeRef(name) =>
builder.append('t').append(name.nameString)
}

builder.append(simpleName.nameString)
Expand Down
64 changes: 61 additions & 3 deletions ir/shared/src/main/scala/org/scalajs/ir/Printers.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,19 @@ object Printers {
print(end)
}

protected final def printRow(ts: List[Type], start: String, sep: String,
end: String)(implicit dummy: DummyImplicit): Unit = {
print(start)
var rest = ts
while (rest.nonEmpty) {
print(rest.head)
rest = rest.tail
if (rest.nonEmpty)
print(sep)
}
print(end)
}

protected def printBlock(tree: Tree): Unit = {
val trees = tree match {
case Block(trees) => trees
Expand Down Expand Up @@ -340,6 +353,40 @@ object Printers {
print(method)
printArgs(args)

case ApplyTypedClosure(flags, fun, args) =>
print(fun)
printArgs(args)

case NewLambda(descriptor, fun) =>
val NewLambda.Descriptor(superClass, interfaces, methodName, paramTypes, resultType) =
descriptor

print("<newLambda>("); indent(); println()

print("extends ")
print(superClass)
if (interfaces.nonEmpty) {
print(" implements ")
print(interfaces.head)
for (intf <- interfaces.tail) {
print(", ")
print(intf)
}
}
print(',')
println()

print("def ")
print(methodName)
printRow(paramTypes, "(", ", ", "): ")
print(resultType)
print(',')
println()

print(fun)

undent(); println(); print(')')

case UnaryOp(op, lhs) =>
import UnaryOp._

Expand Down Expand Up @@ -848,8 +895,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<")
Expand All @@ -864,7 +913,7 @@ object Printers {
print(value)
}
print(">")
printSig(params, restParam, AnyType)
printSig(params, restParam, resultType)
printBlock(body)
print(')')

Expand Down Expand Up @@ -1062,6 +1111,8 @@ object Printers {
print(base)
for (i <- 1 to dims)
print("[]")
case TransientTypeRef(name) =>
print(name)
}

def print(tpe: Type): Unit = tpe match {
Expand Down Expand Up @@ -1091,6 +1142,13 @@ object Printers {
if (!nullable)
print("!")

case ClosureType(paramTypes, resultType, nullable) =>
printRow(paramTypes, "((", ", ", ") => ")
print(resultType)
print(')')
if (!nullable)
print('!')

case RecordType(fields) =>
print('(')
var first = true
Expand Down
2 changes: 1 addition & 1 deletion ir/shared/src/main/scala/org/scalajs/ir/ScalaJSVersions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import scala.util.matching.Regex

object ScalaJSVersions extends VersionChecks(
current = "1.19.0-SNAPSHOT",
binaryEmitted = "1.18"
binaryEmitted = "1.19-SNAPSHOT"
)

/** Helper class to allow for testing of logic. */
Expand Down
Loading