[BE JVM] KT-51271 Set proper indices generating contextual inline call
[Tests] Test inline call with context receivers and default params
This commit is contained in:
Anastasia.Shadrina
committed by
teamcity
teamcity
parent
dc210fa6ef
commit
4b366ddcf6
@@ -76,8 +76,8 @@ class ParametersBuilder private constructor() {
|
||||
return info
|
||||
}
|
||||
|
||||
fun markValueParametersStart() {
|
||||
this.valueParamFirstIndex = params.size
|
||||
fun markValueParametersStart(contextReceiversCount: Int) {
|
||||
this.valueParamFirstIndex = params.size - contextReceiversCount
|
||||
this.nextValueParameterIndex = valueParamFirstIndex
|
||||
}
|
||||
|
||||
|
||||
@@ -97,7 +97,8 @@ class PsiInlineCodegen(
|
||||
hiddenParameters += invocationParamBuilder.addNextParameter(param.asmType, false) to
|
||||
codegen.frameMap.enterTemp(param.asmType)
|
||||
}
|
||||
invocationParamBuilder.markValueParametersStart()
|
||||
// TODO: Add context receivers as hiddenParameters and pass their count
|
||||
invocationParamBuilder.markValueParametersStart(0)
|
||||
}
|
||||
|
||||
override fun putHiddenParamsIntoLocals() {
|
||||
|
||||
+6
@@ -16524,6 +16524,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
|
||||
runTest("compiler/testData/codegen/box/extensionFunctions/contextReceivers/contextualFunctionConversion.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("contextualInlineCall.kt")
|
||||
public void testContextualInlineCall() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/extensionFunctions/contextReceivers/contextualInlineCall.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("delegatedPropertiesOperators.kt")
|
||||
public void testDelegatedPropertiesOperators() throws Exception {
|
||||
|
||||
Generated
+6
@@ -781,6 +781,12 @@ public class Fir2IrTextTestGenerated extends AbstractFir2IrTextTest {
|
||||
runTest("compiler/testData/ir/irText/declarations/contextReceivers/contextualFunctionConversion.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("contextualInlineCall.kt")
|
||||
public void testContextualInlineCall() throws Exception {
|
||||
runTest("compiler/testData/ir/irText/declarations/contextReceivers/contextualInlineCall.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("contextualPrimaryConstructorWithParams.kt")
|
||||
public void testContextualPrimaryConstructorWithParams() throws Exception {
|
||||
|
||||
+1
@@ -595,6 +595,7 @@ private fun IrFunction.generateDefaultsFunctionImpl(
|
||||
newFunction.returnType = returnType.remapTypeParameters(classIfConstructor, newFunction.classIfConstructor)
|
||||
newFunction.dispatchReceiverParameter = dispatchReceiverParameter?.copyTo(newFunction)
|
||||
newFunction.extensionReceiverParameter = extensionReceiverParameter?.copyTo(newFunction)
|
||||
newFunction.contextReceiverParametersCount = contextReceiverParametersCount
|
||||
|
||||
newFunction.valueParameters = valueParameters.map {
|
||||
val newType = it.type.remapTypeParameters(classIfConstructor, newFunction.classIfConstructor)
|
||||
|
||||
+1
-1
@@ -505,7 +505,7 @@ class ExpressionCodegen(
|
||||
callGenerator.genValueAndPut(callee.extensionReceiverParameter!!, receiver, type, this, data)
|
||||
}
|
||||
|
||||
callGenerator.beforeValueParametersStart()
|
||||
callGenerator.beforeValueParametersStart(callee.contextReceiverParametersCount)
|
||||
callee.valueParameters.subList(callee.contextReceiverParametersCount, callee.valueParameters.size)
|
||||
.forEachIndexed { i, valueParameter -> handleValueParameter(i + contextReceivers.size, valueParameter) }
|
||||
|
||||
|
||||
+1
-1
@@ -36,7 +36,7 @@ interface IrCallGenerator {
|
||||
|
||||
fun beforeCallStart() {}
|
||||
|
||||
fun beforeValueParametersStart() {}
|
||||
fun beforeValueParametersStart(contextReceiversCount: Int) {}
|
||||
|
||||
fun afterCallEnd() {}
|
||||
|
||||
|
||||
+2
-2
@@ -150,8 +150,8 @@ class IrInlineCodegen(
|
||||
}
|
||||
}
|
||||
|
||||
override fun beforeValueParametersStart() {
|
||||
invocationParamBuilder.markValueParametersStart()
|
||||
override fun beforeValueParametersStart(contextReceiversCount: Int) {
|
||||
invocationParamBuilder.markValueParametersStart(contextReceiversCount)
|
||||
}
|
||||
|
||||
override fun genInlineCall(
|
||||
|
||||
+39
@@ -0,0 +1,39 @@
|
||||
// !LANGUAGE: +ContextReceivers
|
||||
// TARGET_BACKEND: JVM_IR
|
||||
// IGNORE_BACKEND_FIR: JVM_IR
|
||||
// FIR status: context receivers aren't yet supported
|
||||
|
||||
// KT-51271
|
||||
|
||||
class Context {
|
||||
fun c() = 1
|
||||
}
|
||||
|
||||
context(Context)
|
||||
inline fun testInline() = c()
|
||||
|
||||
context(Context)
|
||||
inline fun testInlineWithArg(i: Int) = i + c()
|
||||
|
||||
context(Context)
|
||||
inline fun Int.testInlineWithExtensionAndArg(i: Int) = this@Int + i + c()
|
||||
|
||||
context(Context)
|
||||
inline fun Int.testInlineWithExtensionAndMultipleArgs(i1: Int, i2: Int) = this@Int + i1 + i2 + c()
|
||||
|
||||
context(Context, Any)
|
||||
inline fun Int.testInlineWithExtensionAndMultipleContextsAndArgs(i1: Int = 1, i2: Int = 2) =
|
||||
this@Int + i1 + i2 + c() + if (this@Any == null) 0 else 1
|
||||
|
||||
fun box(): String = with(Context()) {
|
||||
var result = 0
|
||||
result += testInline()
|
||||
result += testInlineWithArg(1)
|
||||
result += 1.testInlineWithExtensionAndArg(1)
|
||||
result += 1.testInlineWithExtensionAndMultipleArgs(1, 2)
|
||||
with(1) {
|
||||
result += 1.testInlineWithExtensionAndMultipleContextsAndArgs(1, 2)
|
||||
result += 1.testInlineWithExtensionAndMultipleContextsAndArgs()
|
||||
}
|
||||
return if (result == 23) "OK" else "fail"
|
||||
}
|
||||
+175
@@ -0,0 +1,175 @@
|
||||
FILE fqName:<root> fileName:/contextualInlineCall.kt
|
||||
CLASS CLASS name:Context modality:FINAL visibility:public superTypes:[kotlin.Any]
|
||||
$this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Context
|
||||
CONSTRUCTOR visibility:public <> () returnType:<root>.Context [primary]
|
||||
BLOCK_BODY
|
||||
DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
|
||||
INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Context modality:FINAL visibility:public superTypes:[kotlin.Any]'
|
||||
FUN name:c visibility:public modality:FINAL <> ($this:<root>.Context) returnType:kotlin.Int
|
||||
$this: VALUE_PARAMETER name:<this> type:<root>.Context
|
||||
BLOCK_BODY
|
||||
RETURN type=kotlin.Nothing from='public final fun c (): kotlin.Int declared in <root>.Context'
|
||||
CONST Int type=kotlin.Int value=1
|
||||
FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator]
|
||||
overridden:
|
||||
public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any
|
||||
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
|
||||
VALUE_PARAMETER name:other index:0 type:kotlin.Any?
|
||||
FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override]
|
||||
overridden:
|
||||
public open fun hashCode (): kotlin.Int declared in kotlin.Any
|
||||
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
|
||||
FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override]
|
||||
overridden:
|
||||
public open fun toString (): kotlin.String declared in kotlin.Any
|
||||
$this: VALUE_PARAMETER name:<this> type:kotlin.Any
|
||||
FUN name:testInline visibility:public modality:FINAL <> (<this>:<root>.Context) returnType:kotlin.Int [inline]
|
||||
contextReceiverParametersCount: 1
|
||||
VALUE_PARAMETER name:<this> index:0 type:<root>.Context
|
||||
BLOCK_BODY
|
||||
RETURN type=kotlin.Nothing from='public final fun testInline (<this>: <root>.Context): kotlin.Int [inline] declared in <root>'
|
||||
CALL 'public final fun c (): kotlin.Int declared in <root>.Context' type=kotlin.Int origin=null
|
||||
$this: GET_VAR '<this>: <root>.Context declared in <root>.testInline' type=<root>.Context origin=null
|
||||
FUN name:testInlineWithArg visibility:public modality:FINAL <> (<this>:<root>.Context, i:kotlin.Int) returnType:kotlin.Int [inline]
|
||||
contextReceiverParametersCount: 1
|
||||
VALUE_PARAMETER name:<this> index:0 type:<root>.Context
|
||||
VALUE_PARAMETER name:i index:1 type:kotlin.Int
|
||||
BLOCK_BODY
|
||||
RETURN type=kotlin.Nothing from='public final fun testInlineWithArg (<this>: <root>.Context, i: kotlin.Int): kotlin.Int [inline] declared in <root>'
|
||||
CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=PLUS
|
||||
$this: GET_VAR 'i: kotlin.Int declared in <root>.testInlineWithArg' type=kotlin.Int origin=null
|
||||
other: CALL 'public final fun c (): kotlin.Int declared in <root>.Context' type=kotlin.Int origin=null
|
||||
$this: GET_VAR '<this>: <root>.Context declared in <root>.testInlineWithArg' type=<root>.Context origin=null
|
||||
FUN name:testInlineWithExtensionAndArg visibility:public modality:FINAL <> ($receiver:kotlin.Int, <this>:<root>.Context, i:kotlin.Int) returnType:kotlin.Int [inline]
|
||||
contextReceiverParametersCount: 1
|
||||
$receiver: VALUE_PARAMETER name:<this> type:kotlin.Int
|
||||
VALUE_PARAMETER name:<this> index:0 type:<root>.Context
|
||||
VALUE_PARAMETER name:i index:1 type:kotlin.Int
|
||||
BLOCK_BODY
|
||||
RETURN type=kotlin.Nothing from='public final fun testInlineWithExtensionAndArg (<this>: <root>.Context, i: kotlin.Int): kotlin.Int [inline] declared in <root>'
|
||||
CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=PLUS
|
||||
$this: CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=PLUS
|
||||
$this: GET_VAR '<this>: kotlin.Int declared in <root>.testInlineWithExtensionAndArg' type=kotlin.Int origin=null
|
||||
other: GET_VAR 'i: kotlin.Int declared in <root>.testInlineWithExtensionAndArg' type=kotlin.Int origin=null
|
||||
other: CALL 'public final fun c (): kotlin.Int declared in <root>.Context' type=kotlin.Int origin=null
|
||||
$this: GET_VAR '<this>: <root>.Context declared in <root>.testInlineWithExtensionAndArg' type=<root>.Context origin=null
|
||||
FUN name:testInlineWithExtensionAndMultipleArgs visibility:public modality:FINAL <> ($receiver:kotlin.Int, <this>:<root>.Context, i1:kotlin.Int, i2:kotlin.Int) returnType:kotlin.Int [inline]
|
||||
contextReceiverParametersCount: 1
|
||||
$receiver: VALUE_PARAMETER name:<this> type:kotlin.Int
|
||||
VALUE_PARAMETER name:<this> index:0 type:<root>.Context
|
||||
VALUE_PARAMETER name:i1 index:1 type:kotlin.Int
|
||||
VALUE_PARAMETER name:i2 index:2 type:kotlin.Int
|
||||
BLOCK_BODY
|
||||
RETURN type=kotlin.Nothing from='public final fun testInlineWithExtensionAndMultipleArgs (<this>: <root>.Context, i1: kotlin.Int, i2: kotlin.Int): kotlin.Int [inline] declared in <root>'
|
||||
CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=PLUS
|
||||
$this: CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=PLUS
|
||||
$this: CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=PLUS
|
||||
$this: GET_VAR '<this>: kotlin.Int declared in <root>.testInlineWithExtensionAndMultipleArgs' type=kotlin.Int origin=null
|
||||
other: GET_VAR 'i1: kotlin.Int declared in <root>.testInlineWithExtensionAndMultipleArgs' type=kotlin.Int origin=null
|
||||
other: GET_VAR 'i2: kotlin.Int declared in <root>.testInlineWithExtensionAndMultipleArgs' type=kotlin.Int origin=null
|
||||
other: CALL 'public final fun c (): kotlin.Int declared in <root>.Context' type=kotlin.Int origin=null
|
||||
$this: GET_VAR '<this>: <root>.Context declared in <root>.testInlineWithExtensionAndMultipleArgs' type=<root>.Context origin=null
|
||||
FUN name:testInlineWithExtensionAndMultipleContextsAndArgs visibility:public modality:FINAL <> ($receiver:kotlin.Int, <this>:<root>.Context, <this>:kotlin.Any, i1:kotlin.Int, i2:kotlin.Int) returnType:kotlin.Int [inline]
|
||||
contextReceiverParametersCount: 2
|
||||
$receiver: VALUE_PARAMETER name:<this> type:kotlin.Int
|
||||
VALUE_PARAMETER name:<this> index:0 type:<root>.Context
|
||||
VALUE_PARAMETER name:<this> index:1 type:kotlin.Any
|
||||
VALUE_PARAMETER name:i1 index:2 type:kotlin.Int
|
||||
EXPRESSION_BODY
|
||||
CONST Int type=kotlin.Int value=1
|
||||
VALUE_PARAMETER name:i2 index:3 type:kotlin.Int
|
||||
EXPRESSION_BODY
|
||||
CONST Int type=kotlin.Int value=2
|
||||
BLOCK_BODY
|
||||
RETURN type=kotlin.Nothing from='public final fun testInlineWithExtensionAndMultipleContextsAndArgs (<this>: <root>.Context, <this>: kotlin.Any, i1: kotlin.Int, i2: kotlin.Int): kotlin.Int [inline] declared in <root>'
|
||||
CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=PLUS
|
||||
$this: CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=PLUS
|
||||
$this: CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=PLUS
|
||||
$this: CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=PLUS
|
||||
$this: GET_VAR '<this>: kotlin.Int declared in <root>.testInlineWithExtensionAndMultipleContextsAndArgs' type=kotlin.Int origin=null
|
||||
other: GET_VAR 'i1: kotlin.Int declared in <root>.testInlineWithExtensionAndMultipleContextsAndArgs' type=kotlin.Int origin=null
|
||||
other: GET_VAR 'i2: kotlin.Int declared in <root>.testInlineWithExtensionAndMultipleContextsAndArgs' type=kotlin.Int origin=null
|
||||
other: CALL 'public final fun c (): kotlin.Int declared in <root>.Context' type=kotlin.Int origin=null
|
||||
$this: GET_VAR '<this>: <root>.Context declared in <root>.testInlineWithExtensionAndMultipleContextsAndArgs' type=<root>.Context origin=null
|
||||
other: WHEN type=kotlin.Int origin=IF
|
||||
BRANCH
|
||||
if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
|
||||
arg0: GET_VAR '<this>: kotlin.Any declared in <root>.testInlineWithExtensionAndMultipleContextsAndArgs' type=kotlin.Any origin=null
|
||||
arg1: CONST Null type=kotlin.Nothing? value=null
|
||||
then: CONST Int type=kotlin.Int value=0
|
||||
BRANCH
|
||||
if: CONST Boolean type=kotlin.Boolean value=true
|
||||
then: CONST Int type=kotlin.Int value=1
|
||||
FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String
|
||||
BLOCK_BODY
|
||||
RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
|
||||
CALL 'public final fun with <T, R> (receiver: T of kotlin.StandardKt.with, block: @[ExtensionFunctionType] kotlin.Function1<T of kotlin.StandardKt.with, R of kotlin.StandardKt.with>): R of kotlin.StandardKt.with [inline] declared in kotlin.StandardKt' type=kotlin.Nothing origin=null
|
||||
<T>: <root>.Context
|
||||
<R>: kotlin.Nothing
|
||||
receiver: CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.Context' type=<root>.Context origin=null
|
||||
block: FUN_EXPR type=@[ExtensionFunctionType] kotlin.Function1<<root>.Context, kotlin.Nothing> origin=LAMBDA
|
||||
FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($receiver:<root>.Context) returnType:kotlin.Nothing
|
||||
$receiver: VALUE_PARAMETER name:$this$with type:<root>.Context
|
||||
BLOCK_BODY
|
||||
VAR name:result type:kotlin.Int [var]
|
||||
CONST Int type=kotlin.Int value=0
|
||||
SET_VAR 'var result: kotlin.Int [var] declared in <root>.box.<anonymous>' type=kotlin.Unit origin=PLUSEQ
|
||||
CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=PLUSEQ
|
||||
$this: GET_VAR 'var result: kotlin.Int [var] declared in <root>.box.<anonymous>' type=kotlin.Int origin=PLUSEQ
|
||||
other: CALL 'public final fun testInline (<this>: <root>.Context): kotlin.Int [inline] declared in <root>' type=kotlin.Int origin=null
|
||||
<this>: GET_VAR '$this$with: <root>.Context declared in <root>.box.<anonymous>' type=<root>.Context origin=null
|
||||
SET_VAR 'var result: kotlin.Int [var] declared in <root>.box.<anonymous>' type=kotlin.Unit origin=PLUSEQ
|
||||
CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=PLUSEQ
|
||||
$this: GET_VAR 'var result: kotlin.Int [var] declared in <root>.box.<anonymous>' type=kotlin.Int origin=PLUSEQ
|
||||
other: CALL 'public final fun testInlineWithArg (<this>: <root>.Context, i: kotlin.Int): kotlin.Int [inline] declared in <root>' type=kotlin.Int origin=null
|
||||
<this>: GET_VAR '$this$with: <root>.Context declared in <root>.box.<anonymous>' type=<root>.Context origin=null
|
||||
i: CONST Int type=kotlin.Int value=1
|
||||
SET_VAR 'var result: kotlin.Int [var] declared in <root>.box.<anonymous>' type=kotlin.Unit origin=PLUSEQ
|
||||
CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=PLUSEQ
|
||||
$this: GET_VAR 'var result: kotlin.Int [var] declared in <root>.box.<anonymous>' type=kotlin.Int origin=PLUSEQ
|
||||
other: CALL 'public final fun testInlineWithExtensionAndArg (<this>: <root>.Context, i: kotlin.Int): kotlin.Int [inline] declared in <root>' type=kotlin.Int origin=null
|
||||
$receiver: CONST Int type=kotlin.Int value=1
|
||||
<this>: GET_VAR '$this$with: <root>.Context declared in <root>.box.<anonymous>' type=<root>.Context origin=null
|
||||
i: CONST Int type=kotlin.Int value=1
|
||||
SET_VAR 'var result: kotlin.Int [var] declared in <root>.box.<anonymous>' type=kotlin.Unit origin=PLUSEQ
|
||||
CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=PLUSEQ
|
||||
$this: GET_VAR 'var result: kotlin.Int [var] declared in <root>.box.<anonymous>' type=kotlin.Int origin=PLUSEQ
|
||||
other: CALL 'public final fun testInlineWithExtensionAndMultipleArgs (<this>: <root>.Context, i1: kotlin.Int, i2: kotlin.Int): kotlin.Int [inline] declared in <root>' type=kotlin.Int origin=null
|
||||
$receiver: CONST Int type=kotlin.Int value=1
|
||||
<this>: GET_VAR '$this$with: <root>.Context declared in <root>.box.<anonymous>' type=<root>.Context origin=null
|
||||
i1: CONST Int type=kotlin.Int value=1
|
||||
i2: CONST Int type=kotlin.Int value=2
|
||||
CALL 'public final fun with <T, R> (receiver: T of kotlin.StandardKt.with, block: @[ExtensionFunctionType] kotlin.Function1<T of kotlin.StandardKt.with, R of kotlin.StandardKt.with>): R of kotlin.StandardKt.with [inline] declared in kotlin.StandardKt' type=kotlin.Unit origin=null
|
||||
<T>: kotlin.Int
|
||||
<R>: kotlin.Unit
|
||||
receiver: CONST Int type=kotlin.Int value=1
|
||||
block: FUN_EXPR type=@[ExtensionFunctionType] kotlin.Function1<kotlin.Int, kotlin.Unit> origin=LAMBDA
|
||||
FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($receiver:kotlin.Int) returnType:kotlin.Unit
|
||||
$receiver: VALUE_PARAMETER name:$this$with type:kotlin.Int
|
||||
BLOCK_BODY
|
||||
SET_VAR 'var result: kotlin.Int [var] declared in <root>.box.<anonymous>' type=kotlin.Unit origin=PLUSEQ
|
||||
CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=PLUSEQ
|
||||
$this: GET_VAR 'var result: kotlin.Int [var] declared in <root>.box.<anonymous>' type=kotlin.Int origin=PLUSEQ
|
||||
other: CALL 'public final fun testInlineWithExtensionAndMultipleContextsAndArgs (<this>: <root>.Context, <this>: kotlin.Any, i1: kotlin.Int, i2: kotlin.Int): kotlin.Int [inline] declared in <root>' type=kotlin.Int origin=null
|
||||
$receiver: CONST Int type=kotlin.Int value=1
|
||||
<this>: GET_VAR '$this$with: <root>.Context declared in <root>.box.<anonymous>' type=<root>.Context origin=null
|
||||
<this>: GET_VAR '$this$with: kotlin.Int declared in <root>.box.<anonymous>.<anonymous>' type=kotlin.Int origin=null
|
||||
i1: CONST Int type=kotlin.Int value=1
|
||||
i2: CONST Int type=kotlin.Int value=2
|
||||
SET_VAR 'var result: kotlin.Int [var] declared in <root>.box.<anonymous>' type=kotlin.Unit origin=PLUSEQ
|
||||
CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=PLUSEQ
|
||||
$this: GET_VAR 'var result: kotlin.Int [var] declared in <root>.box.<anonymous>' type=kotlin.Int origin=PLUSEQ
|
||||
other: CALL 'public final fun testInlineWithExtensionAndMultipleContextsAndArgs (<this>: <root>.Context, <this>: kotlin.Any, i1: kotlin.Int, i2: kotlin.Int): kotlin.Int [inline] declared in <root>' type=kotlin.Int origin=null
|
||||
$receiver: CONST Int type=kotlin.Int value=1
|
||||
<this>: GET_VAR '$this$with: <root>.Context declared in <root>.box.<anonymous>' type=<root>.Context origin=null
|
||||
<this>: GET_VAR '$this$with: kotlin.Int declared in <root>.box.<anonymous>.<anonymous>' type=kotlin.Int origin=null
|
||||
RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
|
||||
WHEN type=kotlin.String origin=IF
|
||||
BRANCH
|
||||
if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
|
||||
arg0: GET_VAR 'var result: kotlin.Int [var] declared in <root>.box.<anonymous>' type=kotlin.Int origin=null
|
||||
arg1: CONST Int type=kotlin.Int value=23
|
||||
then: CONST String type=kotlin.String value="OK"
|
||||
BRANCH
|
||||
if: CONST Boolean type=kotlin.Boolean value=true
|
||||
then: CONST String type=kotlin.String value="fail"
|
||||
+36
@@ -0,0 +1,36 @@
|
||||
// !LANGUAGE: +ContextReceivers
|
||||
// TARGET_BACKEND: JVM_IR
|
||||
// IGNORE_BACKEND_FIR: JVM_IR
|
||||
|
||||
class Context {
|
||||
fun c() = 1
|
||||
}
|
||||
|
||||
context(Context)
|
||||
inline fun testInline() = c()
|
||||
|
||||
context(Context)
|
||||
inline fun testInlineWithArg(i: Int) = i + c()
|
||||
|
||||
context(Context)
|
||||
inline fun Int.testInlineWithExtensionAndArg(i: Int) = this@Int + i + c()
|
||||
|
||||
context(Context)
|
||||
inline fun Int.testInlineWithExtensionAndMultipleArgs(i1: Int, i2: Int) = this@Int + i1 + i2 + c()
|
||||
|
||||
context(Context, Any)
|
||||
inline fun Int.testInlineWithExtensionAndMultipleContextsAndArgs(i1: Int = 1, i2: Int = 2) =
|
||||
this@Int + i1 + i2 + c() + if (this@Any == null) 0 else 1
|
||||
|
||||
fun box(): String = with(Context()) {
|
||||
var result = 0
|
||||
result += testInline()
|
||||
result += testInlineWithArg(1)
|
||||
result += 1.testInlineWithExtensionAndArg(1)
|
||||
result += 1.testInlineWithExtensionAndMultipleArgs(1, 2)
|
||||
with(1) {
|
||||
result += 1.testInlineWithExtensionAndMultipleContextsAndArgs(1, 2)
|
||||
result += 1.testInlineWithExtensionAndMultipleContextsAndArgs()
|
||||
}
|
||||
return if (result == 23) "OK" else "fail"
|
||||
}
|
||||
+55
@@ -0,0 +1,55 @@
|
||||
class Context {
|
||||
constructor() /* primary */ {
|
||||
super/*Any*/()
|
||||
/* <init>() */
|
||||
|
||||
}
|
||||
|
||||
fun c(): Int {
|
||||
return 1
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
inline fun testInline(<this>: Context): Int {
|
||||
return <this>.c()
|
||||
}
|
||||
|
||||
inline fun testInlineWithArg(<this>: Context, i: Int): Int {
|
||||
return i.plus(other = <this>.c())
|
||||
}
|
||||
|
||||
inline fun Int.testInlineWithExtensionAndArg(<this>: Context, i: Int): Int {
|
||||
return <this>.plus(other = i).plus(other = <this>.c())
|
||||
}
|
||||
|
||||
inline fun Int.testInlineWithExtensionAndMultipleArgs(<this>: Context, i1: Int, i2: Int): Int {
|
||||
return <this>.plus(other = i1).plus(other = i2).plus(other = <this>.c())
|
||||
}
|
||||
|
||||
inline fun Int.testInlineWithExtensionAndMultipleContextsAndArgs(<this>: Context, <this>: Any, i1: Int = 1, i2: Int = 2): Int {
|
||||
return <this>.plus(other = i1).plus(other = i2).plus(other = <this>.c()).plus(other = when {
|
||||
EQEQ(arg0 = <this>, arg1 = null) -> 0
|
||||
else -> 1
|
||||
})
|
||||
}
|
||||
|
||||
fun box(): String {
|
||||
return with<Context, Nothing>(receiver = Context(), block = local fun Context.<anonymous>(): Nothing {
|
||||
var result: Int = 0
|
||||
result = result.plus(other = testInline(<this> = $this$with))
|
||||
result = result.plus(other = testInlineWithArg(<this> = $this$with, i = 1))
|
||||
result = result.plus(other = 1.testInlineWithExtensionAndArg(<this> = $this$with, i = 1))
|
||||
result = result.plus(other = 1.testInlineWithExtensionAndMultipleArgs(<this> = $this$with, i1 = 1, i2 = 2))
|
||||
with<Int, Unit>(receiver = 1, block = local fun Int.<anonymous>() {
|
||||
result = result.plus(other = 1.testInlineWithExtensionAndMultipleContextsAndArgs(<this> = $this$with, <this> = $this$with, i1 = 1, i2 = 2))
|
||||
result = result.plus(other = 1.testInlineWithExtensionAndMultipleContextsAndArgs(<this> = $this$with, <this> = $this$with))
|
||||
}
|
||||
)
|
||||
return when {
|
||||
EQEQ(arg0 = result, arg1 = 23) -> "OK"
|
||||
else -> "fail"
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
+6
@@ -16524,6 +16524,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
|
||||
runTest("compiler/testData/codegen/box/extensionFunctions/contextReceivers/contextualFunctionConversion.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("contextualInlineCall.kt")
|
||||
public void testContextualInlineCall() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/extensionFunctions/contextReceivers/contextualInlineCall.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("delegatedPropertiesOperators.kt")
|
||||
public void testDelegatedPropertiesOperators() throws Exception {
|
||||
|
||||
Generated
+6
@@ -781,6 +781,12 @@ public class IrTextTestGenerated extends AbstractIrTextTest {
|
||||
runTest("compiler/testData/ir/irText/declarations/contextReceivers/contextualFunctionConversion.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("contextualInlineCall.kt")
|
||||
public void testContextualInlineCall() throws Exception {
|
||||
runTest("compiler/testData/ir/irText/declarations/contextReceivers/contextualInlineCall.kt");
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("contextualPrimaryConstructorWithParams.kt")
|
||||
public void testContextualPrimaryConstructorWithParams() throws Exception {
|
||||
|
||||
Reference in New Issue
Block a user