[Tests] Fix contextualInlineCall.kt to avoid subtyping relation error
diff --git a/compiler/testData/codegen/box/extensionFunctions/contextReceivers/contextualInlineCall.kt b/compiler/testData/codegen/box/extensionFunctions/contextReceivers/contextualInlineCall.kt
index 8d7c299..9b5fbe7 100644
--- a/compiler/testData/codegen/box/extensionFunctions/contextReceivers/contextualInlineCall.kt
+++ b/compiler/testData/codegen/box/extensionFunctions/contextReceivers/contextualInlineCall.kt
@@ -21,9 +21,11 @@
context(Context)
inline fun Int.testInlineWithExtensionAndMultipleArgs(i1: Int, i2: Int) = this@Int + i1 + i2 + c()
-context(Context, Any)
+class A(val a: Any?)
+
+context(Context, A)
inline fun Int.testInlineWithExtensionAndMultipleContextsAndArgs(i1: Int = 1, i2: Int = 2) =
- this@Int + i1 + i2 + c() + if (this@Any == null) 0 else 1
+ this@Int + i1 + i2 + c() + if (this@A.a == null) 0 else 1
fun box(): String = with(Context()) {
var result = 0
@@ -31,7 +33,7 @@
result += testInlineWithArg(1)
result += 1.testInlineWithExtensionAndArg(1)
result += 1.testInlineWithExtensionAndMultipleArgs(1, 2)
- with(1) {
+ with(A(1)) {
result += 1.testInlineWithExtensionAndMultipleContextsAndArgs(1, 2)
result += 1.testInlineWithExtensionAndMultipleContextsAndArgs()
}
diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/contextualInlineCall.ir.txt b/compiler/testData/ir/irText/declarations/contextReceivers/contextualInlineCall.ir.txt
index dd7d11bf..dd4610b 100644
--- a/compiler/testData/ir/irText/declarations/contextReceivers/contextualInlineCall.ir.txt
+++ b/compiler/testData/ir/irText/declarations/contextReceivers/contextualInlineCall.ir.txt
@@ -69,11 +69,42 @@
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]
+ CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Any]
+ $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A
+ CONSTRUCTOR visibility:public <> (a:kotlin.Any?) returnType:<root>.A [primary]
+ VALUE_PARAMETER name:a index:0 type:kotlin.Any?
+ BLOCK_BODY
+ DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+ INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Any]'
+ PROPERTY name:a visibility:public modality:FINAL [val]
+ FIELD PROPERTY_BACKING_FIELD name:a type:kotlin.Any? visibility:private [final]
+ EXPRESSION_BODY
+ GET_VAR 'a: kotlin.Any? declared in <root>.A.<init>' type=kotlin.Any? origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+ FUN DEFAULT_PROPERTY_ACCESSOR name:<get-a> visibility:public modality:FINAL <> ($this:<root>.A) returnType:kotlin.Any?
+ correspondingProperty: PROPERTY name:a visibility:public modality:FINAL [val]
+ $this: VALUE_PARAMETER name:<this> type:<root>.A
+ BLOCK_BODY
+ RETURN type=kotlin.Nothing from='public final fun <get-a> (): kotlin.Any? declared in <root>.A'
+ GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:a type:kotlin.Any? visibility:private [final]' type=kotlin.Any? origin=null
+ receiver: GET_VAR '<this>: <root>.A declared in <root>.A.<get-a>' type=<root>.A origin=null
+ 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:testInlineWithExtensionAndMultipleContextsAndArgs visibility:public modality:FINAL <> ($receiver:kotlin.Int, <this>:<root>.Context, <this>:<root>.A, 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:<this> index:1 type:<root>.A
VALUE_PARAMETER name:i1 index:2 type:kotlin.Int
EXPRESSION_BODY
CONST Int type=kotlin.Int value=1
@@ -81,7 +112,7 @@
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>'
+ RETURN type=kotlin.Nothing from='public final fun testInlineWithExtensionAndMultipleContextsAndArgs (<this>: <root>.Context, <this>: <root>.A, 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
@@ -94,7 +125,8 @@
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
+ arg0: CALL 'public final fun <get-a> (): kotlin.Any? declared in <root>.A' type=kotlin.Any? origin=GET_PROPERTY
+ $this: GET_VAR '<this>: <root>.A declared in <root>.testInlineWithExtensionAndMultipleContextsAndArgs' type=<root>.A origin=null
arg1: CONST Null type=kotlin.Nothing? value=null
then: CONST Int type=kotlin.Int value=0
BRANCH
@@ -140,29 +172,30 @@
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
+ <T>: <root>.A
<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
+ receiver: CONSTRUCTOR_CALL 'public constructor <init> (a: kotlin.Any?) [primary] declared in <root>.A' type=<root>.A origin=null
+ a: CONST Int type=kotlin.Int value=1
+ block: FUN_EXPR type=@[ExtensionFunctionType] kotlin.Function1<<root>.A, kotlin.Unit> origin=LAMBDA
+ FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($receiver:<root>.A) returnType:kotlin.Unit
+ $receiver: VALUE_PARAMETER name:$this$with type:<root>.A
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
+ other: CALL 'public final fun testInlineWithExtensionAndMultipleContextsAndArgs (<this>: <root>.Context, <this>: <root>.A, 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
+ <this>: GET_VAR '$this$with: <root>.A declared in <root>.box.<anonymous>.<anonymous>' type=<root>.A 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
+ other: CALL 'public final fun testInlineWithExtensionAndMultipleContextsAndArgs (<this>: <root>.Context, <this>: <root>.A, 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
+ <this>: GET_VAR '$this$with: <root>.A declared in <root>.box.<anonymous>.<anonymous>' type=<root>.A origin=null
RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
WHEN type=kotlin.String origin=IF
BRANCH
diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/contextualInlineCall.kt b/compiler/testData/ir/irText/declarations/contextReceivers/contextualInlineCall.kt
index 3012f6f..3b04aa0 100644
--- a/compiler/testData/ir/irText/declarations/contextReceivers/contextualInlineCall.kt
+++ b/compiler/testData/ir/irText/declarations/contextReceivers/contextualInlineCall.kt
@@ -18,9 +18,11 @@
context(Context)
inline fun Int.testInlineWithExtensionAndMultipleArgs(i1: Int, i2: Int) = this@Int + i1 + i2 + c()
-context(Context, Any)
+class A(val a: Any?)
+
+context(Context, A)
inline fun Int.testInlineWithExtensionAndMultipleContextsAndArgs(i1: Int = 1, i2: Int = 2) =
- this@Int + i1 + i2 + c() + if (this@Any == null) 0 else 1
+ this@Int + i1 + i2 + c() + if (this@A.a == null) 0 else 1
fun box(): String = with(Context()) {
var result = 0
@@ -28,9 +30,9 @@
result += testInlineWithArg(1)
result += 1.testInlineWithExtensionAndArg(1)
result += 1.testInlineWithExtensionAndMultipleArgs(1, 2)
- with(1) {
+ with(A(1)) {
result += 1.testInlineWithExtensionAndMultipleContextsAndArgs(1, 2)
result += 1.testInlineWithExtensionAndMultipleContextsAndArgs()
}
return if (result == 23) "OK" else "fail"
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/contextualInlineCall.kt.txt b/compiler/testData/ir/irText/declarations/contextReceivers/contextualInlineCall.kt.txt
index df623e8..eb213ca 100644
--- a/compiler/testData/ir/irText/declarations/contextReceivers/contextualInlineCall.kt.txt
+++ b/compiler/testData/ir/irText/declarations/contextReceivers/contextualInlineCall.kt.txt
@@ -27,9 +27,22 @@
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 {
+class A {
+ constructor(a: Any?) /* primary */ {
+ super/*Any*/()
+ /* <init>() */
+
+ }
+
+ val a: Any?
+ field = a
+ get
+
+}
+
+inline fun Int.testInlineWithExtensionAndMultipleContextsAndArgs(<this>: Context, <this>: A, 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
+ EQEQ(arg0 = <this>.<get-a>(), arg1 = null) -> 0
else -> 1
})
}
@@ -41,7 +54,7 @@
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>() {
+ with<A, Unit>(receiver = A(a = 1), block = local fun A.<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))
}
