azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[WASM] Add receiver capturing to callable references

Browse Source
This commit is contained in:
Igor Yakovlev
2021-09-17 11:57:38 +02:00
committed by teamcityserver
parent b8d11f7938
commit 41a69ad388
42 changed files with 204 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/WasmCallableReferenceLowering.kt
+29 -35
View File
@@ -15,12 +15,8 @@ import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
import org.jetbrains.kotlin.backend.wasm.WasmBackendContext
import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.descriptors.Visibilities
import org.jetbrains.kotlin.ir.builders.*
import org.jetbrains.kotlin.ir.builders.declarations.addConstructor
import org.jetbrains.kotlin.ir.builders.declarations.addFunction
import org.jetbrains.kotlin.ir.builders.declarations.addValueParameter
import org.jetbrains.kotlin.ir.builders.declarations.buildClass
import org.jetbrains.kotlin.ir.builders.declarations.*
import org.jetbrains.kotlin.ir.declarations.*
import org.jetbrains.kotlin.ir.expressions.*
import org.jetbrains.kotlin.ir.expressions.impl.IrInstanceInitializerCallImpl
@@ -40,7 +36,8 @@ val IrStatementOrigin?.isLambda: Boolean
get() = this == IrStatementOrigin.LAMBDA || this == IrStatementOrigin.ANONYMOUS_FUNCTION
// Originally copied from K/Native
internal class WasmCallableReferenceLowering(private val context: WasmBackendContext) : FileLoweringPass, IrElementTransformerVoidWithContext() {
internal class WasmCallableReferenceLowering(private val context: WasmBackendContext) : FileLoweringPass,
IrElementTransformerVoidWithContext() {
// This pass ignores suspend function references and function references used in inline arguments to inline functions.
private val ignoredFunctionReferences = mutableSetOf<IrFunctionReference>()
@@ -110,6 +107,7 @@ internal class WasmCallableReferenceLowering(private val context: WasmBackendCon
// The type of the reference is KFunction<in A1, ..., in An, out R>
private val parameterTypes = (irFunctionReference.type as IrSimpleType).arguments.map { (it as IrTypeProjection).type }
private val argumentTypes = parameterTypes.dropLast(1)
private val referenceReturnType = parameterTypes.last()
private val typeArgumentsMap = irFunctionReference.typeSubstitutionMap
@@ -147,6 +145,7 @@ internal class WasmCallableReferenceLowering(private val context: WasmBackendCon
if (isLambda) {
this.metadata = irFunctionReference.symbol.owner.metadata
}
addField("receiver", context.irBuiltIns.anyNType)
}
// WASM(TODO)
@@ -227,6 +226,13 @@ internal class WasmCallableReferenceLowering(private val context: WasmBackendCon
// }
}
+IrInstanceInitializerCallImpl(startOffset, endOffset, functionReferenceClass.symbol, context.irBuiltIns.unitType)
if (samSuperType == null && boundReceiver != null) {
+irSetField(
irGet(functionReferenceClass.thisReceiver!!),
functionReferenceClass.fields.first(),
irGet(valueParameters.first())
)
}
}
}
@@ -260,11 +266,11 @@ internal class WasmCallableReferenceLowering(private val context: WasmBackendCon
}
}
body = context.createIrBuilder(symbol).run {
body = context.createIrBuilder(symbol, startOffset, endOffset).run {
var unboundIndex = 0
irExprBody(irCall(callee).apply {
for ((typeParameter, typeArgument) in typeArgumentsMap) {
putTypeArgument(typeParameter.owner.index, typeArgument)
val call = irCall(callee.symbol, referenceReturnType).apply {
for (typeParameter in irFunctionReference.symbol.owner.allTypeParameters) {
putTypeArgument(typeParameter.index, typeArgumentsMap[typeParameter.symbol])
}
for (parameter in callee.explicitParameters) {
@@ -273,30 +279,16 @@ internal class WasmCallableReferenceLowering(private val context: WasmBackendCon
// Bound receiver parameter. For function references, this is stored in a field of the superclass.
// For sam references, we just capture the value in a local variable and LocalDeclarationsLowering
// will put it into a field.
// if (samSuperType == null)
// irImplicitCast(
// irGetField(irGet(dispatchReceiverParameter!!), fakeOverrideReceiverField),
// boundReceiver.second.type
// )
// else
irGet(receiver ?: error("Binding receivers is not supported yet"))
// If a vararg parameter corresponds to exactly one KFunction argument, which is an array, that array
// is forwarded as is.
//
// fun f(x: (Int, Array<String>) -> String) = x(0, arrayOf("OK", "FAIL"))
// fun h(i: Int, vararg xs: String) = xs[i]
// f(::h)
//
parameter.isVararg && unboundIndex < argumentTypes.size && parameter.type == valueParameters[unboundIndex].type ->
irGet(valueParameters[unboundIndex++])
// In all other cases, excess arguments are packed into a new array.
//
// fun g(x: (Int, String, String) -> String) = x(0, "OK", "FAIL")
// f(::h) == g(::h)
//
parameter.isVararg && (unboundIndex < argumentTypes.size || !parameter.hasDefaultValue()) ->
TODO()
if (samSuperType == null)
irImplicitCast(
irGetField(
irGet(dispatchReceiverParameter!!),
functionReferenceClass.fields.first(),
),
boundReceiver.second.type
)
else
irGet(receiver!!)
unboundIndex >= argumentTypes.size ->
// Default value argument (this pass doesn't handle suspend functions, otherwise
@@ -307,7 +299,9 @@ internal class WasmCallableReferenceLowering(private val context: WasmBackendCon
irGet(valueParameters[unboundIndex++])
}?.let { putArgument(callee, parameter, it) }
}
})
}
irExprBody(call)
}
}
}
compiler/testData/codegen/box/callableReference/adaptedReferences/adaptedVarargFunImportedFromObject.kt
Vendored
+1 -2
View File
@@ -1,5 +1,4 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
import Host.foo
compiler/testData/codegen/box/callableReference/adaptedReferences/inlineBound.kt
Vendored
+1 -2
View File
@@ -1,5 +1,4 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
inline fun foo(x: () -> Unit): String {
x()
compiler/testData/codegen/box/callableReference/adaptedReferences/innerConstructorWithVararg.kt
Vendored
+1 -2
View File
@@ -1,5 +1,4 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
// !LANGUAGE: +NewInference +FunctionReferenceWithDefaultValueAsOtherType
class Outer(val o: String) {
compiler/testData/codegen/box/callableReference/adaptedReferences/noNameClashForReferencesToSameFunction.kt
Vendored
+1 -2
View File
@@ -1,5 +1,4 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
var result = ""
class C(val token: String) {
compiler/testData/codegen/box/callableReference/arrayOf.kt
Vendored
-2
View File
@@ -1,5 +1,3 @@
// IGNORE_BACKEND: WASM
fun use(fn: (Array<String>) -> Array<String>) =
fn(arrayOf("OK"))
compiler/testData/codegen/box/callableReference/bound/adapted.kt
Vendored
+1 -2
View File
@@ -1,5 +1,4 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
class C {
fun ffff(i: Int, s: String = "OK") = s
}
compiler/testData/codegen/box/callableReference/bound/arrayConstructorArgument.kt
Vendored
+1 -2
View File
@@ -1,6 +1,5 @@
// WITH_RUNTIME
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
class C(val x: String) {
fun foo(i: Int): Char = x[i]
}
compiler/testData/codegen/box/callableReference/bound/arrayGetIntrinsic.kt
Vendored
+1 -2
View File
@@ -1,5 +1,4 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
fun box(): String {
return if ((arrayOf(1, 2, 3)::get)(1) == 2) "OK" else "Fail"
}
compiler/testData/codegen/box/callableReference/bound/boundReferenceToOverloadedFunction.kt
Vendored
+1 -2
View File
@@ -1,5 +1,4 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
// !LANGUAGE: +NewInference
interface JsonParser
compiler/testData/codegen/box/callableReference/bound/coercionToUnit.kt
Vendored
+1 -2
View File
@@ -1,5 +1,4 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
// KJS_WITH_FULL_RUNTIME
// !LANGUAGE: +NewInference
// WITH_RUNTIME
compiler/testData/codegen/box/callableReference/bound/companionObjectReceiver.kt
Vendored
+1 -2
View File
@@ -1,5 +1,4 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
class A {
companion object {
fun ok() = "OK"
compiler/testData/codegen/box/callableReference/bound/dontShareReceiver.kt
Vendored
+1 -2
View File
@@ -1,5 +1,4 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
fun box(): String {
var state = 0
compiler/testData/codegen/box/callableReference/bound/emptyLHS.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
// WASM_MUTE_REASON: PROPERTY_REFERENCES
var result = ""
class A {
compiler/testData/codegen/box/callableReference/bound/enumEntryMember.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
// WASM_MUTE_REASON: FUNCTION_REFERENCES
// IGNORE_BACKEND: JS, JS_IR
// IGNORE_BACKEND: JS_IR_ES6
enum class E {
compiler/testData/codegen/box/callableReference/bound/equals/nullableReceiverInEquals.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
// WASM_MUTE_REASON: PROPERTY_REFERENCES
// IGNORE_BACKEND: JS_IR
// IGNORE_BACKEND: JS_IR_ES6
// TODO: investigate should it be ran for JS or not
compiler/testData/codegen/box/callableReference/bound/equals/receiverInEquals.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
// WASM_MUTE_REASON: FUNCTION_REFERENCES
// IGNORE_BACKEND: JS_IR
// IGNORE_BACKEND: JS_IR_ES6
// TODO: investigate should it be ran for JS or not
compiler/testData/codegen/box/callableReference/bound/genericBoundPropertyAsCrossinline.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
// WASM_MUTE_REASON: PROPERTY_REFERENCES
// KT-30629
abstract class BaseFragment<T : BaseViewModel> {
compiler/testData/codegen/box/callableReference/bound/genericValOnLHS.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
// WASM_MUTE_REASON: PROPERTY_REFERENCES
class Generic<P : Any>(val p: P)
class Host {
compiler/testData/codegen/box/callableReference/bound/kCallableNameIntrinsic.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
// WASM_MUTE_REASON: PROPERTY_REFERENCES
// SKIP_SOURCEMAP_REMAPPING
fun box(): String {
compiler/testData/codegen/box/callableReference/bound/kt12738.kt
Vendored
+1 -2
View File
@@ -1,5 +1,4 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
fun <T> get(t: T): () -> String {
return t::toString
}
compiler/testData/codegen/box/callableReference/bound/kt15446.kt
Vendored
+1 -2
View File
@@ -1,5 +1,4 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
// KJS_WITH_FULL_RUNTIME
//WITH_RUNTIME
fun box(): String {
compiler/testData/codegen/box/callableReference/bound/multiCase.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
// WASM_MUTE_REASON: PROPERTY_REFERENCES
// IGNORE_BACKEND: NATIVE
class A(var v: Int) {
fun f(x: Int) = x * v
compiler/testData/codegen/box/callableReference/bound/objectReceiver.kt
Vendored
+1 -2
View File
@@ -1,5 +1,4 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
object Singleton {
fun ok() = "OK"
}
compiler/testData/codegen/box/callableReference/bound/primitiveReceiver.kt
Vendored
+1 -2
View File
@@ -1,5 +1,4 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
fun Boolean.foo() = 1
fun Byte.foo() = 2
fun Short.foo() = 3
compiler/testData/codegen/box/callableReference/bound/receiverEvaluatedOnce.kt
Vendored
+1 -2
View File
@@ -1,5 +1,4 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
var x = 0
class A {
compiler/testData/codegen/box/callableReference/bound/simpleFunction.kt
Vendored
+1 -2
View File
@@ -1,5 +1,4 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
fun box(): String {
val f = "KOTLIN"::get
return "${f(1)}${f(0)}"
compiler/testData/codegen/box/callableReference/function/argumentTypesNoinline.kt
Vendored
+1 -2
View File
@@ -1,5 +1,4 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
fun <T> id(x: T): T = x
fun <T> String.extId(x: T): T = x
compiler/testData/codegen/box/callableReference/function/innerClassConstructorWithTwoReceivers.kt
Vendored
+1 -2
View File
@@ -1,5 +1,4 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
abstract class A {
inner class InnerInA {
fun returnOk() = "OK"
compiler/testData/codegen/box/callableReference/function/kt47741.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: WASM
fun box(): String {
val generateId = (1 .. Int.MAX_VALUE).iterator()::next
compiler/testData/codegen/box/callableReference/function/referenceToCompanionMember.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
// WASM_MUTE_REASON: FUNCTION_REFERENCES
// WITH_RUNTIME
// IGNORE_BACKEND: JS
compiler/testData/codegen/box/callableReference/genericConstructorReference.kt
Vendored
+1 -2
View File
@@ -1,5 +1,4 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
// KT-42025
open class L<LL>(val ll: LL)
compiler/testData/codegen/box/callableReference/genericLocalClassConstructorReference.kt
Vendored
+1 -2
View File
@@ -1,5 +1,4 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
// KT-42025
open class L<LL>(val ll: LL)
compiler/testData/codegen/box/callableReference/property/localClassVar.kt
Vendored
+22 -10
View File
@@ -1,11 +1,23 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: PROPERTY_REFERENCES
fun box(): String {
class Local {
var result = "Fail"
}
val l = Local()
(Local::result).set(l, "OK")
return (Local::result).get(l)
class X(val ok: String) {
fun y(): String = ok
}
fun box(): String {
val x = X("OK")
val y = x::y
return y()
}
//fun y(): String = "OK"
//
//fun box(): String {
// val y = ::y
// return y.invoke()
//}
//val x = "OK"
//
//fun box(): String {
// val x = ::x
// return x.get()
//}
compiler/testData/codegen/box/casts/dontCreateInconsistentTypeDuringStarProjectionSubstitution.kt
Vendored
+1 -2
View File
@@ -1,5 +1,4 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
interface I
interface Foo<in L : I, in M>
compiler/testData/codegen/box/directInvokeOptimization/boundInnerContructorRef.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: WASM
// CHECK_BYTECODE_TEXT
// JVM_IR_TEMPLATES
// 0 Function(^.)*.invoke
compiler/testData/codegen/box/directInvokeOptimization/boundMemberRef.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: WASM
// CHECK_BYTECODE_TEXT
// JVM_IR_TEMPLATES
// 0 Function(^.)*.invoke
compiler/testData/codegen/box/enum/kt7257_boundReference1.kt
Vendored
+1 -2
View File
@@ -1,5 +1,4 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
enum class X {
B {
val k = "K"
compiler/testData/codegen/box/functions/kt47449.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// IGNORE_BACKEND: JS
// IGNORE_BACKEND: WASM
typealias EmptyFunctionResult<T> = () -> T
compiler/testData/codegen/box/syntheticAccessors/protectedMemberReferenceAccessor/kt46597_method.kt
Vendored
-2
View File
@@ -1,5 +1,3 @@
// IGNORE_BACKEND: WASM
// FILE: a.kt
package a
compiler/testData/codegen/boxInline/callableReference/adaptedReferences/inlineBound.kt
Vendored
+1 -2
View File
@@ -1,5 +1,4 @@
// DONT_TARGET_EXACT_BACKEND: WASM
// WASM_MUTE_REASON: BINDING_RECEIVERS
// FILE: 1.kt
package test