diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt index 49126f69776..ff83e8d2898 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/RenderIrElement.kt @@ -871,9 +871,7 @@ private fun StringBuilder.renderAsAnnotationArgument(irElement: IrElement?, rend null -> append("") is IrConstructorCall -> renderAsAnnotation(irElement, renderer, options) is IrConst<*> -> { - append('\'') - append(irElement.value.toString()) - append('\'') + renderIrConstAsAnnotationArgument(irElement) } is IrVararg -> { appendIterableWith(irElement.elements, prefix = "[", postfix = "]", separator = ", ") { @@ -888,6 +886,17 @@ private fun StringBuilder.renderAsAnnotationArgument(irElement: IrElement?, rend } } +private fun StringBuilder.renderIrConstAsAnnotationArgument(const: IrConst<*>) { + val quotes = when (const.kind) { + IrConstKind.String -> "\"" + IrConstKind.Char -> "'" + else -> "" + } + append(quotes) + append(const.value.toString()) + append(quotes) +} + private fun renderClassWithRenderer(declaration: IrClass, renderer: RenderIrElementVisitor?, options: DumpIrTreeOptions) = declaration.runTrimEnd { "CLASS ${renderOriginIfNonTrivial()}" + diff --git a/compiler/testData/codegen/box/annotations/javaAnnotationArrayValueDefault.fir.ir.txt b/compiler/testData/codegen/box/annotations/javaAnnotationArrayValueDefault.fir.ir.txt index 1b408e1c25a..76a41d813e4 100644 --- a/compiler/testData/codegen/box/annotations/javaAnnotationArrayValueDefault.fir.ir.txt +++ b/compiler/testData/codegen/box/annotations/javaAnnotationArrayValueDefault.fir.ir.txt @@ -45,7 +45,7 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:kotlin.Any CLASS CLASS name:MyClass3 modality:FINAL visibility:public superTypes:[kotlin.Any] annotations: - JavaAnn(value = ['asd']) + JavaAnn(value = ["asd"]) $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.MyClass3 CONSTRUCTOR visibility:public <> () returnType:.MyClass3 [primary] BLOCK_BODY diff --git a/compiler/testData/codegen/box/annotations/javaAnnotationArrayValueDefault.ir.txt b/compiler/testData/codegen/box/annotations/javaAnnotationArrayValueDefault.ir.txt index 521a05d51da..2dec1a0abcf 100644 --- a/compiler/testData/codegen/box/annotations/javaAnnotationArrayValueDefault.ir.txt +++ b/compiler/testData/codegen/box/annotations/javaAnnotationArrayValueDefault.ir.txt @@ -45,7 +45,7 @@ FILE fqName: fileName:/1.kt $this: VALUE_PARAMETER name: type:kotlin.Any CLASS CLASS name:MyClass3 modality:FINAL visibility:public superTypes:[kotlin.Any] annotations: - JavaAnn(value = ['asd']) + JavaAnn(value = ["asd"]) $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.MyClass3 CONSTRUCTOR visibility:public <> () returnType:.MyClass3 [primary] BLOCK_BODY diff --git a/compiler/testData/codegen/box/annotations/selfReferentialAnnotation.fir.ir.txt b/compiler/testData/codegen/box/annotations/selfReferentialAnnotation.fir.ir.txt index 185362ecc21..3c3ab43dce0 100644 --- a/compiler/testData/codegen/box/annotations/selfReferentialAnnotation.fir.ir.txt +++ b/compiler/testData/codegen/box/annotations/selfReferentialAnnotation.fir.ir.txt @@ -4,7 +4,7 @@ FILE fqName: fileName:/selfReferentialAnnotation.kt CONSTRUCTOR visibility:public <> (e:kotlin.Int) returnType:.Ann [primary] VALUE_PARAMETER name:e index:0 type:kotlin.Int annotations: - Ann(e = '1') + Ann(e = 1) BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:Ann modality:OPEN visibility:public superTypes:[kotlin.Annotation]' @@ -34,7 +34,7 @@ FILE fqName: fileName:/selfReferentialAnnotation.kt $this: VALUE_PARAMETER name: type:kotlin.Any CLASS ANNOTATION_CLASS name:MyRequiresOptIn modality:OPEN visibility:public superTypes:[kotlin.Annotation] annotations: - MyRequiresOptIn(a = '', b = GET_ENUM 'ENUM_ENTRY name:ERROR' type=.MyRequiresOptIn.MyLevel) + MyRequiresOptIn(a = "", b = GET_ENUM 'ENUM_ENTRY name:ERROR' type=.MyRequiresOptIn.MyLevel) $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.MyRequiresOptIn CONSTRUCTOR visibility:public <> (a:kotlin.String, b:.MyRequiresOptIn.MyLevel) returnType:.MyRequiresOptIn [primary] VALUE_PARAMETER name:a index:0 type:kotlin.String @@ -42,7 +42,7 @@ FILE fqName: fileName:/selfReferentialAnnotation.kt CONST String type=kotlin.String value="" VALUE_PARAMETER name:b index:1 type:.MyRequiresOptIn.MyLevel annotations: - MyRequiresOptIn(a = '', b = GET_ENUM 'ENUM_ENTRY name:WARNING' type=.MyRequiresOptIn.MyLevel) + MyRequiresOptIn(a = "", b = GET_ENUM 'ENUM_ENTRY name:WARNING' type=.MyRequiresOptIn.MyLevel) EXPRESSION_BODY GET_ENUM 'ENUM_ENTRY name:ERROR' type=.MyRequiresOptIn.MyLevel BLOCK_BODY diff --git a/compiler/testData/codegen/box/annotations/selfReferentialAnnotation.ir.txt b/compiler/testData/codegen/box/annotations/selfReferentialAnnotation.ir.txt index ebe40ad3a72..9139a1b7df9 100644 --- a/compiler/testData/codegen/box/annotations/selfReferentialAnnotation.ir.txt +++ b/compiler/testData/codegen/box/annotations/selfReferentialAnnotation.ir.txt @@ -4,7 +4,7 @@ FILE fqName: fileName:/selfReferentialAnnotation.kt CONSTRUCTOR visibility:public <> (e:kotlin.Int) returnType:.Ann [primary] VALUE_PARAMETER name:e index:0 type:kotlin.Int annotations: - Ann(e = '1') + Ann(e = 1) BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ANNOTATION_CLASS name:Ann modality:OPEN visibility:public superTypes:[kotlin.Annotation]' @@ -34,7 +34,7 @@ FILE fqName: fileName:/selfReferentialAnnotation.kt $this: VALUE_PARAMETER name: type:kotlin.Any CLASS ANNOTATION_CLASS name:MyRequiresOptIn modality:OPEN visibility:public superTypes:[kotlin.Annotation] annotations: - MyRequiresOptIn(a = '', b = GET_ENUM 'ENUM_ENTRY name:ERROR' type=.MyRequiresOptIn.MyLevel) + MyRequiresOptIn(a = "", b = GET_ENUM 'ENUM_ENTRY name:ERROR' type=.MyRequiresOptIn.MyLevel) $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.MyRequiresOptIn CONSTRUCTOR visibility:public <> (a:kotlin.String, b:.MyRequiresOptIn.MyLevel) returnType:.MyRequiresOptIn [primary] VALUE_PARAMETER name:a index:0 type:kotlin.String @@ -42,7 +42,7 @@ FILE fqName: fileName:/selfReferentialAnnotation.kt CONST String type=kotlin.String value="" VALUE_PARAMETER name:b index:1 type:.MyRequiresOptIn.MyLevel annotations: - MyRequiresOptIn(a = '', b = GET_ENUM 'ENUM_ENTRY name:WARNING' type=.MyRequiresOptIn.MyLevel) + MyRequiresOptIn(a = "", b = GET_ENUM 'ENUM_ENTRY name:WARNING' type=.MyRequiresOptIn.MyLevel) EXPRESSION_BODY GET_ENUM 'ENUM_ENTRY name:ERROR' type=.MyRequiresOptIn.MyLevel BLOCK_BODY diff --git a/compiler/testData/codegen/box/sam/kt54600.ir.txt b/compiler/testData/codegen/box/sam/kt54600.ir.txt index 97f44ae2dda..c82a221afe8 100644 --- a/compiler/testData/codegen/box/sam/kt54600.ir.txt +++ b/compiler/testData/codegen/box/sam/kt54600.ir.txt @@ -10,7 +10,7 @@ FILE fqName: fileName:/box.kt TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit CONSTRUCTOR_CALL 'public constructor (filter: @[FlexibleNullability] .Condition?) declared in .J' type=.J origin=null filter: TYPE_OP type=@[FlexibleNullability] .Condition? origin=SAM_CONVERSION typeOperand=@[FlexibleNullability] .Condition? - TYPE_OP type=@[FlexibleNullability] kotlin.Function1<@[ParameterName(name = 't')] kotlin.Any?, kotlin.Boolean>? origin=IMPLICIT_CAST typeOperand=@[FlexibleNullability] kotlin.Function1<@[ParameterName(name = 't')] kotlin.Any?, kotlin.Boolean>? + TYPE_OP type=@[FlexibleNullability] kotlin.Function1<@[ParameterName(name = "t")] kotlin.Any?, kotlin.Boolean>? origin=IMPLICIT_CAST typeOperand=@[FlexibleNullability] kotlin.Function1<@[ParameterName(name = "t")] kotlin.Any?, kotlin.Boolean>? GET_VAR 'filter: kotlin.Function1? declared in .foo' type=kotlin.Function1? origin=null RETURN type=kotlin.Nothing from='public final fun foo (filter: kotlin.Function1?): kotlin.String declared in ' CONST String type=kotlin.String value="OK" diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/annotationArgRendering.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/annotationArgRendering.fir.kt index d94f9b6682c..4dd8e370adf 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/annotationArgRendering.fir.kt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/annotationArgRendering.fir.kt @@ -21,9 +21,9 @@ expect fun kclassArg() // FILE: jvm.kt actual annotation class Ann -actual fun stringConcat() {} +actual fun stringConcat() {} // Not reported in K1, because supported starting from K2 -actual fun onType(): Any? = null +actual fun onType(): Any? = null actual fun kclassArg() {} diff --git a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/checkDiagnosticFullText.fir.ir.diag.txt b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/checkDiagnosticFullText.fir.ir.diag.txt index ab8d1730c84..fbfe23e677f 100644 --- a/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/checkDiagnosticFullText.fir.ir.diag.txt +++ b/compiler/testData/diagnostics/tests/multiplatform/actualAnnotationsNotMatchExpect/checkDiagnosticFullText.fir.ir.diag.txt @@ -10,7 +10,7 @@ All annotations from expect `ViaTypealias` must be present with the same argumen /jvm.kt:(301,371): warning: Annotation `@Ann` is missing on actual declaration. All annotations from expect `MemberScopeViaTypealias.foo` must be present with the same arguments on actual `MemberScopeViaTypealiasImpl.foo`, otherwise they might behave incorrectly. -/jvm.kt:(373,427): warning: Annotation `@WithArg(s = 'str')` has different arguments on actual declaration: `@WithArg(s = 'other str')`. +/jvm.kt:(373,427): warning: Annotation `@WithArg(s = "str")` has different arguments on actual declaration: `@WithArg(s = "other str")`. All annotations from expect `withDifferentArg` must be present with the same arguments on actual `withDifferentArg`, otherwise they might behave incorrectly. /jvm.kt:(429,468): warning: Annotation `@Ann` is missing on actual declaration. diff --git a/compiler/testData/ir/irText/classes/dataClasses/openDataClass.ir.txt b/compiler/testData/ir/irText/classes/dataClasses/openDataClass.ir.txt index bd55d636fd2..2edc2bb799b 100644 --- a/compiler/testData/ir/irText/classes/dataClasses/openDataClass.ir.txt +++ b/compiler/testData/ir/irText/classes/dataClasses/openDataClass.ir.txt @@ -1,7 +1,7 @@ FILE fqName: fileName:/openDataClass.kt CLASS CLASS name:ValidatedProperties modality:OPEN visibility:public [data] superTypes:[kotlin.Any] annotations: - Suppress(names = ['INCOMPATIBLE_MODIFIERS']) + Suppress(names = ["INCOMPATIBLE_MODIFIERS"]) $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.ValidatedProperties CONSTRUCTOR visibility:public <> (test1:kotlin.String, test2:kotlin.String) returnType:.ValidatedProperties [primary] VALUE_PARAMETER name:test1 index:0 type:kotlin.String diff --git a/compiler/testData/ir/irText/declarations/annotations/annotationsInAnnotationArguments.ir.txt b/compiler/testData/ir/irText/declarations/annotations/annotationsInAnnotationArguments.ir.txt index d29ce3a7be7..d172de1239d 100644 --- a/compiler/testData/ir/irText/declarations/annotations/annotationsInAnnotationArguments.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/annotationsInAnnotationArguments.ir.txt @@ -94,6 +94,6 @@ FILE fqName: fileName:/annotationsInAnnotationArguments.kt $this: VALUE_PARAMETER name: type:kotlin.Any FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit annotations: - A2(a = A1(x = '42')) - AA(xs = [A1(x = '1'), A1(x = '2')]) + A2(a = A1(x = 42)) + AA(xs = [A1(x = 1), A1(x = 2)]) BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.ir.txt b/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.ir.txt index c38257524a3..4620372fb9a 100644 --- a/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.ir.txt @@ -48,19 +48,19 @@ FILE fqName: fileName:/annotationsWithDefaultParameterValues.kt $this: VALUE_PARAMETER name: type:kotlin.Any FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit annotations: - A(x = 'abc', y = '123') + A(x = "abc", y = 123) BLOCK_BODY FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit annotations: - A(x = 'def', y = ) + A(x = "def", y = ) BLOCK_BODY FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Unit annotations: - A(x = 'ghi', y = ) + A(x = "ghi", y = ) BLOCK_BODY FUN name:test4 visibility:public modality:FINAL <> () returnType:kotlin.Unit annotations: - A(x = , y = '456') + A(x = , y = 456) BLOCK_BODY FUN name:test5 visibility:public modality:FINAL <> () returnType:kotlin.Unit annotations: diff --git a/compiler/testData/ir/irText/declarations/annotations/annotationsWithVarargParameters.ir.txt b/compiler/testData/ir/irText/declarations/annotations/annotationsWithVarargParameters.ir.txt index 9a449d308f9..ecd6266bbb5 100644 --- a/compiler/testData/ir/irText/declarations/annotations/annotationsWithVarargParameters.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/annotationsWithVarargParameters.ir.txt @@ -32,11 +32,11 @@ FILE fqName: fileName:/annotationsWithVarargParameters.kt $this: VALUE_PARAMETER name: type:kotlin.Any FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit annotations: - A(xs = ['abc', 'def']) + A(xs = ["abc", "def"]) BLOCK_BODY FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit annotations: - A(xs = ['abc']) + A(xs = ["abc"]) BLOCK_BODY FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Unit annotations: diff --git a/compiler/testData/ir/irText/declarations/annotations/arrayInAnnotationArguments.ir.txt b/compiler/testData/ir/irText/declarations/annotations/arrayInAnnotationArguments.ir.txt index 91f33d6540f..da4cd583198 100644 --- a/compiler/testData/ir/irText/declarations/annotations/arrayInAnnotationArguments.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/arrayInAnnotationArguments.ir.txt @@ -63,11 +63,11 @@ FILE fqName: fileName:/arrayInAnnotationArguments.kt $this: VALUE_PARAMETER name: type:kotlin.Any FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit annotations: - TestAnnWithIntArray(x = ['1', '2', '3']) - TestAnnWithStringArray(x = ['a', 'b', 'c']) + TestAnnWithIntArray(x = [1, 2, 3]) + TestAnnWithStringArray(x = ["a", "b", "c"]) BLOCK_BODY FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit annotations: - TestAnnWithIntArray(x = ['4', '5', '6']) - TestAnnWithStringArray(x = ['d', 'e', 'f']) + TestAnnWithIntArray(x = [4, 5, 6]) + TestAnnWithStringArray(x = ["d", "e", "f"]) BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.ir.txt b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.ir.txt index 4bb36f3b6e4..db3f97ce484 100644 --- a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.ir.txt @@ -32,7 +32,7 @@ FILE fqName: fileName:/classesWithAnnotations.kt $this: VALUE_PARAMETER name: type:kotlin.Any CLASS CLASS name:TestClass modality:FINAL visibility:public superTypes:[kotlin.Any] annotations: - TestAnn(x = 'class') + TestAnn(x = "class") $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestClass CONSTRUCTOR visibility:public <> () returnType:.TestClass [primary] BLOCK_BODY @@ -53,7 +53,7 @@ FILE fqName: fileName:/classesWithAnnotations.kt $this: VALUE_PARAMETER name: type:kotlin.Any CLASS INTERFACE name:TestInterface modality:ABSTRACT visibility:public superTypes:[kotlin.Any] annotations: - TestAnn(x = 'interface') + TestAnn(x = "interface") $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestInterface FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: @@ -70,7 +70,7 @@ FILE fqName: fileName:/classesWithAnnotations.kt $this: VALUE_PARAMETER name: type:kotlin.Any CLASS OBJECT name:TestObject modality:FINAL visibility:public superTypes:[kotlin.Any] annotations: - TestAnn(x = 'object') + TestAnn(x = "object") $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestObject CONSTRUCTOR visibility:private <> () returnType:.TestObject [primary] BLOCK_BODY @@ -97,7 +97,7 @@ FILE fqName: fileName:/classesWithAnnotations.kt INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Host modality:FINAL visibility:public superTypes:[kotlin.Any]' CLASS OBJECT name:TestCompanion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any] annotations: - TestAnn(x = 'companion') + TestAnn(x = "companion") $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Host.TestCompanion CONSTRUCTOR visibility:private <> () returnType:.Host.TestCompanion [primary] BLOCK_BODY @@ -131,7 +131,7 @@ FILE fqName: fileName:/classesWithAnnotations.kt $this: VALUE_PARAMETER name: type:kotlin.Any CLASS ENUM_CLASS name:TestEnum modality:FINAL visibility:public superTypes:[kotlin.Enum<.TestEnum>] annotations: - TestAnn(x = 'enum') + TestAnn(x = "enum") $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestEnum CONSTRUCTOR visibility:private <> () returnType:.TestEnum [primary] BLOCK_BODY @@ -197,7 +197,7 @@ FILE fqName: fileName:/classesWithAnnotations.kt $this: VALUE_PARAMETER name: type:kotlin.Enum<.TestEnum> CLASS ANNOTATION_CLASS name:TestAnnotation modality:OPEN visibility:public superTypes:[kotlin.Annotation] annotations: - TestAnn(x = 'annotation') + TestAnn(x = "annotation") $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestAnnotation CONSTRUCTOR visibility:public <> () returnType:.TestAnnotation [primary] BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.ir.txt b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.ir.txt index 768f5f538de..7ccc82b9e8b 100644 --- a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.ir.txt @@ -32,7 +32,7 @@ FILE fqName: fileName:/classesWithAnnotations.kt $this: VALUE_PARAMETER name: type:kotlin.Any CLASS CLASS name:TestClass modality:FINAL visibility:public superTypes:[kotlin.Any] annotations: - TestAnn(x = 'class') + TestAnn(x = "class") $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestClass CONSTRUCTOR visibility:public <> () returnType:.TestClass [primary] BLOCK_BODY @@ -53,7 +53,7 @@ FILE fqName: fileName:/classesWithAnnotations.kt $this: VALUE_PARAMETER name: type:kotlin.Any CLASS INTERFACE name:TestInterface modality:ABSTRACT visibility:public superTypes:[kotlin.Any] annotations: - TestAnn(x = 'interface') + TestAnn(x = "interface") $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestInterface FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: @@ -70,7 +70,7 @@ FILE fqName: fileName:/classesWithAnnotations.kt $this: VALUE_PARAMETER name: type:kotlin.Any CLASS OBJECT name:TestObject modality:FINAL visibility:public superTypes:[kotlin.Any] annotations: - TestAnn(x = 'object') + TestAnn(x = "object") $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestObject CONSTRUCTOR visibility:private <> () returnType:.TestObject [primary] BLOCK_BODY @@ -97,7 +97,7 @@ FILE fqName: fileName:/classesWithAnnotations.kt INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Host modality:FINAL visibility:public superTypes:[kotlin.Any]' CLASS OBJECT name:TestCompanion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any] annotations: - TestAnn(x = 'companion') + TestAnn(x = "companion") $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Host.TestCompanion CONSTRUCTOR visibility:private <> () returnType:.Host.TestCompanion [primary] BLOCK_BODY @@ -131,7 +131,7 @@ FILE fqName: fileName:/classesWithAnnotations.kt $this: VALUE_PARAMETER name: type:kotlin.Any CLASS ENUM_CLASS name:TestEnum modality:FINAL visibility:public superTypes:[kotlin.Enum<.TestEnum>] annotations: - TestAnn(x = 'enum') + TestAnn(x = "enum") $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestEnum CONSTRUCTOR visibility:private <> () returnType:.TestEnum [primary] BLOCK_BODY @@ -197,7 +197,7 @@ FILE fqName: fileName:/classesWithAnnotations.kt SYNTHETIC_BODY kind=ENUM_ENTRIES CLASS ANNOTATION_CLASS name:TestAnnotation modality:OPEN visibility:public superTypes:[kotlin.Annotation] annotations: - TestAnn(x = 'annotation') + TestAnn(x = "annotation") $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestAnnotation CONSTRUCTOR visibility:public <> () returnType:.TestAnnotation [primary] BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.ir.txt b/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.ir.txt index f577c7d5704..fe184b92964 100644 --- a/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.ir.txt @@ -41,9 +41,9 @@ FILE fqName: fileName:/constExpressionsInAnnotationArguments.kt $this: VALUE_PARAMETER name: type:kotlin.Any FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit annotations: - A(x = '1') + A(x = 1) BLOCK_BODY FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit annotations: - A(x = '2') + A(x = 2) BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.ir.txt b/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.ir.txt index 484a3d6dc62..216490741a2 100644 --- a/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.ir.txt @@ -34,13 +34,13 @@ FILE fqName: fileName:/constructorsWithAnnotations.kt $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestClass CONSTRUCTOR visibility:public <> () returnType:.TestClass [primary] annotations: - TestAnn(x = '1') + TestAnn(x = 1) BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestClass modality:FINAL visibility:public superTypes:[kotlin.Any]' CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:.TestClass annotations: - TestAnn(x = '2') + TestAnn(x = 2) VALUE_PARAMETER name:x index:0 type:kotlin.Int BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in .TestClass' diff --git a/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.ir.txt b/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.ir.txt index d05f4d64203..6a649622c72 100644 --- a/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.ir.txt @@ -93,7 +93,7 @@ FILE fqName: fileName:/delegatedPropertyAccessorsWithAnnotations.kt value: CONST Int type=kotlin.Int value=1 FUN DELEGATED_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int annotations: - A(x = 'test1.get') + A(x = "test1.get") correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [delegated,val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' @@ -108,7 +108,7 @@ FILE fqName: fileName:/delegatedPropertyAccessorsWithAnnotations.kt value: CONST Int type=kotlin.Int value=2 FUN DELEGATED_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int annotations: - A(x = 'test2.get') + A(x = "test2.get") correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [delegated,var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' @@ -118,11 +118,11 @@ FILE fqName: fileName:/delegatedPropertyAccessorsWithAnnotations.kt kProp: PROPERTY_REFERENCE 'public final test2: kotlin.Int' field=null getter='public final fun (): kotlin.Int declared in ' setter='public final fun (: kotlin.Int): kotlin.Unit declared in ' type=kotlin.reflect.KMutableProperty0 origin=PROPERTY_REFERENCE_FOR_DELEGATE FUN DELEGATED_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> (:kotlin.Int) returnType:kotlin.Unit annotations: - A(x = 'test2.set') + A(x = "test2.set") correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [delegated,var] VALUE_PARAMETER name: index:0 type:kotlin.Int annotations: - A(x = 'test2.set.param') + A(x = "test2.set.param") BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (: kotlin.Int): kotlin.Unit declared in ' CALL 'public final fun setValue (thisRef: kotlin.Any?, kProp: kotlin.Any?, newValue: kotlin.Int): kotlin.Unit declared in .Cell' type=kotlin.Unit origin=null diff --git a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.ir.txt b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.ir.txt index 518f7fbd5df..e398f559500 100644 --- a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.ir.txt @@ -39,12 +39,12 @@ FILE fqName: fileName:/enumEntriesWithAnnotations.kt INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:TestEnum modality:OPEN visibility:public superTypes:[kotlin.Enum<.TestEnum>]' ENUM_ENTRY name:ENTRY1 annotations: - TestAnn(x = 'ENTRY1') + TestAnn(x = "ENTRY1") init: EXPRESSION_BODY ENUM_CONSTRUCTOR_CALL 'private constructor () declared in .TestEnum' ENUM_ENTRY name:ENTRY2 annotations: - TestAnn(x = 'ENTRY2') + TestAnn(x = "ENTRY2") init: EXPRESSION_BODY ENUM_CONSTRUCTOR_CALL 'private constructor () declared in .TestEnum.ENTRY2' class: CLASS ENUM_ENTRY name:ENTRY2 modality:FINAL visibility:private superTypes:[.TestEnum] diff --git a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.ir.txt b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.ir.txt index c5e039fdf85..f9afc85ba30 100644 --- a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.ir.txt @@ -39,17 +39,17 @@ FILE fqName: fileName:/enumEntriesWithAnnotations.kt INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_CLASS name:TestEnum modality:OPEN visibility:public superTypes:[kotlin.Enum<.TestEnum>]' ENUM_ENTRY name:ENTRY1 annotations: - TestAnn(x = 'ENTRY1') + TestAnn(x = "ENTRY1") init: EXPRESSION_BODY ENUM_CONSTRUCTOR_CALL 'private constructor () declared in .TestEnum' ENUM_ENTRY name:ENTRY2 annotations: - TestAnn(x = 'ENTRY2') + TestAnn(x = "ENTRY2") init: EXPRESSION_BODY ENUM_CONSTRUCTOR_CALL 'private constructor () declared in .TestEnum.ENTRY2' class: CLASS ENUM_ENTRY name:ENTRY2 modality:FINAL visibility:private superTypes:[.TestEnum] annotations: - TestAnn(x = 'ENTRY2') + TestAnn(x = "ENTRY2") $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestEnum.ENTRY2 CONSTRUCTOR visibility:private <> () returnType:.TestEnum.ENTRY2 [primary] BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/annotations/fieldsWithAnnotations.ir.txt b/compiler/testData/ir/irText/declarations/annotations/fieldsWithAnnotations.ir.txt index 8917a0bc759..0fea6c102aa 100644 --- a/compiler/testData/ir/irText/declarations/annotations/fieldsWithAnnotations.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/fieldsWithAnnotations.ir.txt @@ -33,7 +33,7 @@ FILE fqName: fileName:/fieldsWithAnnotations.kt PROPERTY name:testVal visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:testVal type:kotlin.String visibility:private [final,static] annotations: - TestAnn(x = 'testVal.field') + TestAnn(x = "testVal.field") EXPRESSION_BODY CONST String type=kotlin.String value="a val" FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String @@ -44,7 +44,7 @@ FILE fqName: fileName:/fieldsWithAnnotations.kt PROPERTY name:testVar visibility:public modality:FINAL [var] FIELD PROPERTY_BACKING_FIELD name:testVar type:kotlin.String visibility:private [static] annotations: - TestAnn(x = 'testVar.field') + TestAnn(x = "testVar.field") EXPRESSION_BODY CONST String type=kotlin.String value="a var" FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String diff --git a/compiler/testData/ir/irText/declarations/annotations/fileAnnotations.ir.txt b/compiler/testData/ir/irText/declarations/annotations/fileAnnotations.ir.txt index 90d700ebcec..11e34a757e9 100644 --- a/compiler/testData/ir/irText/declarations/annotations/fileAnnotations.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/fileAnnotations.ir.txt @@ -1,6 +1,6 @@ FILE fqName:test fileName:/fileAnnotations.kt annotations: - A(x = 'File annotation') + A(x = "File annotation") CLASS ANNOTATION_CLASS name:A modality:OPEN visibility:public superTypes:[kotlin.Annotation] annotations: Target(allowedTargets = [GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:FILE' type=kotlin.annotation.AnnotationTarget]) diff --git a/compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.ir.txt b/compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.ir.txt index a99670cdc12..959ffd2564d 100644 --- a/compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.ir.txt @@ -32,5 +32,5 @@ FILE fqName: fileName:/functionsWithAnnotations.kt $this: VALUE_PARAMETER name: type:kotlin.Any FUN name:testSimpleFunction visibility:public modality:FINAL <> () returnType:kotlin.Unit annotations: - TestAnn(x = '42') + TestAnn(x = 42) BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/annotations/genericAnnotationClasses.fir.ir.txt b/compiler/testData/ir/irText/declarations/annotations/genericAnnotationClasses.fir.ir.txt index 332fab1437c..1615bc4612a 100644 --- a/compiler/testData/ir/irText/declarations/annotations/genericAnnotationClasses.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/genericAnnotationClasses.fir.ir.txt @@ -219,11 +219,11 @@ FILE fqName:ann fileName:/genericAnnotationClasses.kt $this: VALUE_PARAMETER name: type:kotlin.Any CLASS CLASS name:CC modality:FINAL visibility:public superTypes:[kotlin.Any] annotations: - Test1(x = '42') - Test2(x = '38') - Test3>(x = Test1>>(x = '39')) - Test4(x = [Test3>(x = Test1>>(x = '40')), Test3>(x = Test1>>(x = '50')), Test3>(x = Test1>>(x = '60'))]) - Test5(xs = [Test3>(x = Test1>>(x = '70')), Test3>(x = Test1>>(x = '80'))]) + Test1(x = 42) + Test2(x = 38) + Test3>(x = Test1>>(x = 39)) + Test4(x = [Test3>(x = Test1>>(x = 40)), Test3>(x = Test1>>(x = 50)), Test3>(x = Test1>>(x = 60))]) + Test5(xs = [Test3>(x = Test1>>(x = 70)), Test3>(x = Test1>>(x = 80))]) $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:ann.CC CONSTRUCTOR visibility:public <> () returnType:ann.CC [primary] BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/annotations/genericAnnotationClasses.ir.txt b/compiler/testData/ir/irText/declarations/annotations/genericAnnotationClasses.ir.txt index 78002b93c21..dd051aa75e8 100644 --- a/compiler/testData/ir/irText/declarations/annotations/genericAnnotationClasses.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/genericAnnotationClasses.ir.txt @@ -219,11 +219,11 @@ FILE fqName:ann fileName:/genericAnnotationClasses.kt $this: VALUE_PARAMETER name: type:kotlin.Any CLASS CLASS name:CC modality:FINAL visibility:public superTypes:[kotlin.Any] annotations: - Test1(x = '42') - Test2(x = '38') - Test3>(x = Test1>>(x = '39')) - Test4(x = [Test3>(x = Test1>>(x = '40')), Test3>(x = Test1>>(x = '50')), Test3>(x = Test1>>(x = '60'))]) - Test5(xs = [[Test3>(x = Test1>>(x = '70'))], [Test3>(x = Test1>>(x = '80'))]]) + Test1(x = 42) + Test2(x = 38) + Test3>(x = Test1>>(x = 39)) + Test4(x = [Test3>(x = Test1>>(x = 40)), Test3>(x = Test1>>(x = 50)), Test3>(x = Test1>>(x = 60))]) + Test5(xs = [[Test3>(x = Test1>>(x = 70))], [Test3>(x = Test1>>(x = 80))]]) $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:ann.CC CONSTRUCTOR visibility:public <> () returnType:ann.CC [primary] BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.ir.txt b/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.ir.txt index 0020ca82486..d308fe7619e 100644 --- a/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/inheritingDeprecation.ir.txt @@ -3,7 +3,7 @@ FILE fqName: fileName:/inheritingDeprecation.kt $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.IFoo PROPERTY name:prop visibility:public modality:OPEN [val] annotations: - Deprecated(message = '', replaceWith = , level = ) + Deprecated(message = "", replaceWith = , level = ) FUN name: visibility:public modality:OPEN <> ($this:.IFoo) returnType:kotlin.String correspondingProperty: PROPERTY name:prop visibility:public modality:OPEN [val] $this: VALUE_PARAMETER name: type:.IFoo @@ -12,7 +12,7 @@ FILE fqName: fileName:/inheritingDeprecation.kt CONST String type=kotlin.String value="" PROPERTY name:extProp visibility:public modality:OPEN [val] annotations: - Deprecated(message = '', replaceWith = , level = ) + Deprecated(message = "", replaceWith = , level = ) FUN name: visibility:public modality:OPEN <> ($this:.IFoo, $receiver:kotlin.String) returnType:kotlin.String correspondingProperty: PROPERTY name:extProp visibility:public modality:OPEN [val] $this: VALUE_PARAMETER name: type:.IFoo @@ -92,7 +92,7 @@ FILE fqName: fileName:/inheritingDeprecation.kt INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:DefaultImpl modality:FINAL visibility:public superTypes:[.IFoo]' PROPERTY FAKE_OVERRIDE name:prop visibility:public modality:OPEN [fake_override,val] annotations: - Deprecated(message = '', replaceWith = , level = ) + Deprecated(message = "", replaceWith = , level = ) overridden: public open prop: kotlin.String FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:.IFoo) returnType:kotlin.String [fake_override] @@ -102,7 +102,7 @@ FILE fqName: fileName:/inheritingDeprecation.kt $this: VALUE_PARAMETER name: type:.IFoo PROPERTY FAKE_OVERRIDE name:extProp visibility:public modality:OPEN [fake_override,val] annotations: - Deprecated(message = '', replaceWith = , level = ) + Deprecated(message = "", replaceWith = , level = ) overridden: public open extProp: kotlin.String FUN FAKE_OVERRIDE name: visibility:public modality:OPEN <> ($this:.IFoo, $receiver:kotlin.String) returnType:kotlin.String [fake_override] diff --git a/compiler/testData/ir/irText/declarations/annotations/javaAnnotation.ir.txt b/compiler/testData/ir/irText/declarations/annotations/javaAnnotation.ir.txt index 341ea418f9a..f543a67e242 100644 --- a/compiler/testData/ir/irText/declarations/annotations/javaAnnotation.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/javaAnnotation.ir.txt @@ -5,9 +5,9 @@ FILE fqName: fileName:/javaAnnotation.kt BLOCK_BODY FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit annotations: - JavaAnn(value = 'abc', i = '123') + JavaAnn(value = "abc", i = 123) BLOCK_BODY FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Unit annotations: - JavaAnn(value = 'abc', i = '123') + JavaAnn(value = "abc", i = 123) BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/annotations/javaAnnotationWithSingleArrayArgument.fir.ir.txt b/compiler/testData/ir/irText/declarations/annotations/javaAnnotationWithSingleArrayArgument.fir.ir.txt index d3f639bdaff..d919cc929ef 100644 --- a/compiler/testData/ir/irText/declarations/annotations/javaAnnotationWithSingleArrayArgument.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/javaAnnotationWithSingleArrayArgument.fir.ir.txt @@ -260,9 +260,9 @@ FILE fqName: fileName:/C.kt INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[.A]' FUN FAKE_OVERRIDE name:test visibility:public modality:OPEN <> ($this:.A) returnType:kotlin.Unit [fake_override] annotations: - Annos(value = Anno(token = 'OK')) - Strings(value = 'OK') - Ints(value = '42') + Annos(value = Anno(token = "OK")) + Strings(value = "OK") + Ints(value = 42) Enums(value = GET_ENUM 'ENUM_ENTRY name:EA' type=.E) Classes(value = CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Double modality:FINAL visibility:public superTypes:[kotlin.Number; kotlin.Comparable; java.io.Serializable]' type=kotlin.reflect.KClass) overridden: diff --git a/compiler/testData/ir/irText/declarations/annotations/javaAnnotationWithSingleArrayArgument.ir.txt b/compiler/testData/ir/irText/declarations/annotations/javaAnnotationWithSingleArrayArgument.ir.txt index 0bb74dc04c1..960b313cd73 100644 --- a/compiler/testData/ir/irText/declarations/annotations/javaAnnotationWithSingleArrayArgument.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/javaAnnotationWithSingleArrayArgument.ir.txt @@ -273,9 +273,9 @@ FILE fqName: fileName:/C.kt $this: VALUE_PARAMETER name: type:kotlin.Any FUN FAKE_OVERRIDE name:test visibility:public modality:OPEN <> ($this:.A) returnType:kotlin.Unit [fake_override] annotations: - Annos(value = [Anno(token = 'OK')]) - Strings(value = ['OK']) - Ints(value = ['42']) + Annos(value = [Anno(token = "OK")]) + Strings(value = ["OK"]) + Ints(value = [42]) Enums(value = [GET_ENUM 'ENUM_ENTRY name:EA' type=.E]) Classes(value = [CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Double modality:FINAL visibility:public superTypes:[kotlin.Number; kotlin.Comparable; java.io.Serializable]' type=kotlin.reflect.KClass]) overridden: diff --git a/compiler/testData/ir/irText/declarations/annotations/localDelegatedPropertiesWithAnnotations.ir.txt b/compiler/testData/ir/irText/declarations/annotations/localDelegatedPropertiesWithAnnotations.ir.txt index 154fe8cd132..b5d6eab46e2 100644 --- a/compiler/testData/ir/irText/declarations/annotations/localDelegatedPropertiesWithAnnotations.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/localDelegatedPropertiesWithAnnotations.ir.txt @@ -35,7 +35,7 @@ FILE fqName: fileName:/localDelegatedPropertiesWithAnnotations.kt BLOCK_BODY LOCAL_DELEGATED_PROPERTY name:test type:kotlin.Int flags:val annotations: - A(x = 'foo/test') + A(x = "foo/test") VAR PROPERTY_DELEGATE name:test$delegate type:kotlin.Lazy [val] CALL 'public final fun lazy (initializer: kotlin.Function0): kotlin.Lazy declared in kotlin' type=kotlin.Lazy origin=null : kotlin.Int diff --git a/compiler/testData/ir/irText/declarations/annotations/propertiesWithAnnotations.ir.txt b/compiler/testData/ir/irText/declarations/annotations/propertiesWithAnnotations.ir.txt index c314ed20bc2..f37540520c4 100644 --- a/compiler/testData/ir/irText/declarations/annotations/propertiesWithAnnotations.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/propertiesWithAnnotations.ir.txt @@ -32,7 +32,7 @@ FILE fqName: fileName:/propertiesWithAnnotations.kt $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY name:testVal visibility:public modality:FINAL [val] annotations: - TestAnn(x = 'testVal.property') + TestAnn(x = "testVal.property") FIELD PROPERTY_BACKING_FIELD name:testVal type:kotlin.String visibility:private [final,static] EXPRESSION_BODY CONST String type=kotlin.String value="" diff --git a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.ir.txt b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.ir.txt index 3d6e7d30be9..c26b5136cae 100644 --- a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.ir.txt @@ -44,7 +44,7 @@ FILE fqName: fileName:/propertyAccessorsFromClassHeaderWithAnnotations.kt GET_VAR 'x: kotlin.Int declared in .C.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int annotations: - A(x = 'C.x.get') + A(x = "C.x.get") correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val] $this: VALUE_PARAMETER name: type:.C BLOCK_BODY @@ -57,7 +57,7 @@ FILE fqName: fileName:/propertyAccessorsFromClassHeaderWithAnnotations.kt GET_VAR 'y: kotlin.Int declared in .C.' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int annotations: - A(x = 'C.y.get') + A(x = "C.y.get") correspondingProperty: PROPERTY name:y visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.C BLOCK_BODY @@ -66,7 +66,7 @@ FILE fqName: fileName:/propertyAccessorsFromClassHeaderWithAnnotations.kt receiver: GET_VAR ': .C declared in .C.' type=.C origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C, :kotlin.Int) returnType:kotlin.Unit annotations: - A(x = 'C.y.set') + A(x = "C.y.set") correspondingProperty: PROPERTY name:y visibility:public modality:FINAL [var] $this: VALUE_PARAMETER name: type:.C VALUE_PARAMETER name: index:0 type:kotlin.Int diff --git a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.ir.txt b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.ir.txt index 6853d4fa4cc..3e985d04078 100644 --- a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.ir.txt @@ -33,7 +33,7 @@ FILE fqName: fileName:/propertyAccessorsWithAnnotations.kt PROPERTY name:test1 visibility:public modality:FINAL [val] FUN name: visibility:public modality:FINAL <> () returnType:kotlin.String annotations: - TestAnn(x = 'test1.get') + TestAnn(x = "test1.get") correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' @@ -41,14 +41,14 @@ FILE fqName: fileName:/propertyAccessorsWithAnnotations.kt PROPERTY name:test2 visibility:public modality:FINAL [var] FUN name: visibility:public modality:FINAL <> () returnType:kotlin.String annotations: - TestAnn(x = 'test2.get') + TestAnn(x = "test2.get") correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' CONST String type=kotlin.String value="" FUN name: visibility:public modality:FINAL <> (value:kotlin.String) returnType:kotlin.Unit annotations: - TestAnn(x = 'test2.set') + TestAnn(x = "test2.set") correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [var] VALUE_PARAMETER name:value index:0 type:kotlin.String BLOCK_BODY @@ -58,7 +58,7 @@ FILE fqName: fileName:/propertyAccessorsWithAnnotations.kt CONST String type=kotlin.String value="" FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String annotations: - TestAnn(x = 'test3.get') + TestAnn(x = "test3.get") correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [val] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' @@ -69,14 +69,14 @@ FILE fqName: fileName:/propertyAccessorsWithAnnotations.kt CONST String type=kotlin.String value="" FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.String annotations: - TestAnn(x = 'test4.get') + TestAnn(x = "test4.get") correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.String declared in ' GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.String visibility:private [static]' type=kotlin.String origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> (:kotlin.String) returnType:kotlin.Unit annotations: - TestAnn(x = 'test4.set') + TestAnn(x = "test4.set") correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [var] VALUE_PARAMETER name: index:0 type:kotlin.String BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/annotations/spreadOperatorInAnnotationArguments.fir.ir.txt b/compiler/testData/ir/irText/declarations/annotations/spreadOperatorInAnnotationArguments.fir.ir.txt index f9b233321b6..4b4e87606a3 100644 --- a/compiler/testData/ir/irText/declarations/annotations/spreadOperatorInAnnotationArguments.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/spreadOperatorInAnnotationArguments.fir.ir.txt @@ -32,5 +32,5 @@ FILE fqName: fileName:/spreadOperatorInAnnotationArguments.kt $this: VALUE_PARAMETER name: type:kotlin.Any FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit annotations: - A(xs = ['a', 'b']) + A(xs = ["a", "b"]) BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/annotations/spreadOperatorInAnnotationArguments.ir.txt b/compiler/testData/ir/irText/declarations/annotations/spreadOperatorInAnnotationArguments.ir.txt index 759f19586e4..f389cec3e3c 100644 --- a/compiler/testData/ir/irText/declarations/annotations/spreadOperatorInAnnotationArguments.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/spreadOperatorInAnnotationArguments.ir.txt @@ -32,5 +32,5 @@ FILE fqName: fileName:/spreadOperatorInAnnotationArguments.kt $this: VALUE_PARAMETER name: type:kotlin.Any FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit annotations: - A(xs = [['a'], ['b']]) + A(xs = [["a"], ["b"]]) BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/annotations/typeAliasesWithAnnotations.ir.txt b/compiler/testData/ir/irText/declarations/annotations/typeAliasesWithAnnotations.ir.txt index dac08ededa0..e3c4057b4ab 100644 --- a/compiler/testData/ir/irText/declarations/annotations/typeAliasesWithAnnotations.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/typeAliasesWithAnnotations.ir.txt @@ -34,4 +34,4 @@ FILE fqName: fileName:/typeAliasesWithAnnotations.kt $this: VALUE_PARAMETER name: type:kotlin.Any TYPEALIAS name:TestTypeAlias visibility:public expandedType:kotlin.String annotations: - TestAnn(x = 'TestTypeAlias') + TestAnn(x = "TestTypeAlias") diff --git a/compiler/testData/ir/irText/declarations/annotations/valueParametersWithAnnotations.ir.txt b/compiler/testData/ir/irText/declarations/annotations/valueParametersWithAnnotations.ir.txt index d738fe21f5e..a17a4acfac0 100644 --- a/compiler/testData/ir/irText/declarations/annotations/valueParametersWithAnnotations.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/valueParametersWithAnnotations.ir.txt @@ -33,14 +33,14 @@ FILE fqName: fileName:/valueParametersWithAnnotations.kt FUN name:testFun visibility:public modality:FINAL <> (x:kotlin.Int) returnType:kotlin.Unit VALUE_PARAMETER name:x index:0 type:kotlin.Int annotations: - TestAnn(x = 'testFun.x') + TestAnn(x = "testFun.x") BLOCK_BODY CLASS CLASS name:TestClassConstructor1 modality:FINAL visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TestClassConstructor1 CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:.TestClassConstructor1 [primary] VALUE_PARAMETER name:x index:0 type:kotlin.Int annotations: - TestAnn(x = 'TestClassConstructor1.x') + TestAnn(x = "TestClassConstructor1.x") BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestClassConstructor1 modality:FINAL visibility:public superTypes:[kotlin.Any]' diff --git a/compiler/testData/ir/irText/declarations/annotations/varargsInAnnotationArguments.ir.txt b/compiler/testData/ir/irText/declarations/annotations/varargsInAnnotationArguments.ir.txt index 56bc72c08f7..0e8bf738c62 100644 --- a/compiler/testData/ir/irText/declarations/annotations/varargsInAnnotationArguments.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/varargsInAnnotationArguments.ir.txt @@ -94,9 +94,9 @@ FILE fqName: fileName:/varargsInAnnotationArguments.kt $this: VALUE_PARAMETER name: type:kotlin.Any FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit annotations: - A1(xs = ['1', '2', '3']) - A2(xs = ['a', 'b', 'c']) - AA(xs = [A1(xs = ['4']), A1(xs = ['5']), A1(xs = ['6'])]) + A1(xs = [1, 2, 3]) + A2(xs = ["a", "b", "c"]) + AA(xs = [A1(xs = [4]), A1(xs = [5]), A1(xs = [6])]) BLOCK_BODY FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit annotations: diff --git a/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.ir.txt b/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.ir.txt index b7406b2adff..2521a0d3d3f 100644 --- a/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.ir.txt +++ b/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.ir.txt @@ -34,9 +34,9 @@ FILE fqName: fileName:/variablesWithAnnotations.kt BLOCK_BODY VAR name:testVal type:kotlin.String [val] annotations: - TestAnn(x = 'foo/testVal') + TestAnn(x = "foo/testVal") CONST String type=kotlin.String value="testVal" VAR name:testVar type:kotlin.String [var] annotations: - TestAnn(x = 'foo/testVar') + TestAnn(x = "foo/testVar") CONST String type=kotlin.String value="testVar" diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/contextualFunctionConversion.ir.txt b/compiler/testData/ir/irText/declarations/contextReceivers/contextualFunctionConversion.ir.txt index 7ca04b7c2fa..4b8a32b0362 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/contextualFunctionConversion.ir.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/contextualFunctionConversion.ir.txt @@ -1,16 +1,16 @@ FILE fqName: fileName:/contextualFunctionConversion.kt - FUN name:withContext visibility:public modality:FINAL <> (f:@[ContextFunctionTypeParams(count = '1')] kotlin.Function1) returnType:kotlin.String - VALUE_PARAMETER name:f index:0 type:@[ContextFunctionTypeParams(count = '1')] kotlin.Function1 + FUN name:withContext visibility:public modality:FINAL <> (f:@[ContextFunctionTypeParams(count = 1)] kotlin.Function1) returnType:kotlin.String + VALUE_PARAMETER name:f index:0 type:@[ContextFunctionTypeParams(count = 1)] kotlin.Function1 BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun withContext (f: @[ContextFunctionTypeParams(count = '1')] kotlin.Function1): kotlin.String declared in ' + RETURN type=kotlin.Nothing from='public final fun withContext (f: @[ContextFunctionTypeParams(count = 1)] kotlin.Function1): kotlin.String declared in ' CALL 'public abstract fun invoke (p1: P1 of kotlin.Function1): R of kotlin.Function1 declared in kotlin.Function1' type=kotlin.String origin=INVOKE - $this: GET_VAR 'f: @[ContextFunctionTypeParams(count = '1')] kotlin.Function1 declared in .withContext' type=@[ContextFunctionTypeParams(count = '1')] kotlin.Function1 origin=VARIABLE_AS_FUNCTION + $this: GET_VAR 'f: @[ContextFunctionTypeParams(count = 1)] kotlin.Function1 declared in .withContext' type=@[ContextFunctionTypeParams(count = 1)] kotlin.Function1 origin=VARIABLE_AS_FUNCTION p1: CONST String type=kotlin.String value="OK" FUN name:callWithContext visibility:public modality:FINAL <> (f:kotlin.Function1) returnType:kotlin.String VALUE_PARAMETER name:f index:0 type:kotlin.Function1 BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun callWithContext (f: kotlin.Function1): kotlin.String declared in ' - CALL 'public final fun withContext (f: @[ContextFunctionTypeParams(count = '1')] kotlin.Function1): kotlin.String declared in ' type=kotlin.String origin=null + CALL 'public final fun withContext (f: @[ContextFunctionTypeParams(count = 1)] kotlin.Function1): kotlin.String declared in ' type=kotlin.String origin=null f: GET_VAR 'f: kotlin.Function1 declared in .callWithContext' type=kotlin.Function1 origin=null FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/functionalType.ir.txt b/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/functionalType.ir.txt index 8decfe4ca5c..b0515a16c2a 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/functionalType.ir.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/functionalType.ir.txt @@ -78,16 +78,16 @@ FILE fqName: fileName:/functionalType.kt overridden: public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any - FUN name:f visibility:public modality:FINAL ($receiver:.K, $context_receiver_0:.O, g:@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function3<.O, .K, .Param, T of .f>) returnType:T of .f + FUN name:f visibility:public modality:FINAL ($receiver:.K, $context_receiver_0:.O, g:@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function3<.O, .K, .Param, T of .f>) returnType:T of .f TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false contextReceiverParametersCount: 1 $receiver: VALUE_PARAMETER name: type:.K VALUE_PARAMETER name:$context_receiver_0 index:0 type:.O - VALUE_PARAMETER name:g index:1 type:@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function3<.O, .K, .Param, T of .f> + VALUE_PARAMETER name:g index:1 type:@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function3<.O, .K, .Param, T of .f> BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun f ($context_receiver_0: .O, g: @[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function3<.O, .K, .Param, T of .f>): T of .f declared in ' + RETURN type=kotlin.Nothing from='public final fun f ($context_receiver_0: .O, g: @[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function3<.O, .K, .Param, T of .f>): T of .f declared in ' CALL 'public abstract fun invoke (p1: P1 of kotlin.Function3, p2: P2 of kotlin.Function3, p3: P3 of kotlin.Function3): R of kotlin.Function3 declared in kotlin.Function3' type=T of .f origin=INVOKE - $this: GET_VAR 'g: @[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function3<.O, .K, .Param, T of .f> declared in .f' type=@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function3<.O, .K, .Param, T of .f> origin=VARIABLE_AS_FUNCTION + $this: GET_VAR 'g: @[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function3<.O, .K, .Param, T of .f> declared in .f' type=@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function3<.O, .K, .Param, T of .f> origin=VARIABLE_AS_FUNCTION p1: GET_VAR '$context_receiver_0: .O declared in .f' type=.O origin=null p2: GET_VAR ': .K declared in .f' type=.K origin=null p3: CONSTRUCTOR_CALL 'public constructor () declared in .Param' type=.Param origin=null @@ -103,11 +103,11 @@ FILE fqName: fileName:/functionalType.kt $receiver: VALUE_PARAMETER name:$this$with type:.O BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.String declared in .box' - CALL 'public final fun f ($context_receiver_0: .O, g: @[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function3<.O, .K, .Param, T of .f>): T of .f declared in ' type=kotlin.String origin=null + CALL 'public final fun f ($context_receiver_0: .O, g: @[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function3<.O, .K, .Param, T of .f>): T of .f declared in ' type=kotlin.String origin=null : kotlin.String $receiver: CONSTRUCTOR_CALL 'public constructor () declared in .K' type=.K origin=null $context_receiver_0: GET_VAR '$this$with: .O declared in .box.' type=.O origin=null - g: FUN_EXPR type=@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function3<.O, .K, .Param, kotlin.String> origin=LAMBDA + g: FUN_EXPR type=@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function3<.O, .K, .Param, kotlin.String> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> ($receiver:.K, $context_receiver_0:.O, it:.Param) returnType:kotlin.String contextReceiverParametersCount: 1 $receiver: VALUE_PARAMETER name:$this$f type:.K diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/monoidSum.fir.ir.txt b/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/monoidSum.fir.ir.txt index b7836dbb215..ee83cc9bf29 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/monoidSum.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/monoidSum.fir.ir.txt @@ -142,21 +142,21 @@ FILE fqName: fileName:/monoidSum.kt VALUE_PARAMETER name:$context_receiver_0 index:0 type:.Monoid.sum> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun sum ($context_receiver_0: .Monoid.sum>): T of .sum declared in ' - CALL 'public final fun fold (initial: R of kotlin.collections.fold, operation: kotlin.Function2<@[ParameterName(name = 'acc')] R of kotlin.collections.fold, T of kotlin.collections.fold, R of kotlin.collections.fold>): R of kotlin.collections.fold declared in kotlin.collections' type=T of .sum origin=null + CALL 'public final fun fold (initial: R of kotlin.collections.fold, operation: kotlin.Function2<@[ParameterName(name = "acc")] R of kotlin.collections.fold, T of kotlin.collections.fold, R of kotlin.collections.fold>): R of kotlin.collections.fold declared in kotlin.collections' type=T of .sum origin=null : T of .sum : T of .sum $receiver: GET_VAR ': kotlin.collections.List.sum> declared in .sum' type=kotlin.collections.List.sum> origin=null initial: CALL 'public abstract fun (): T of .Monoid declared in .Monoid' type=T of .sum origin=GET_PROPERTY $this: GET_VAR '$context_receiver_0: .Monoid.sum> declared in .sum' type=.Monoid.sum> origin=null - operation: FUN_EXPR type=kotlin.Function2<@[ParameterName(name = 'acc')] T of .sum, T of .sum, T of .sum> origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (acc:@[ParameterName(name = 'acc')] T of .sum, e:T of .sum) returnType:T of .sum - VALUE_PARAMETER name:acc index:0 type:@[ParameterName(name = 'acc')] T of .sum + operation: FUN_EXPR type=kotlin.Function2<@[ParameterName(name = "acc")] T of .sum, T of .sum, T of .sum> origin=LAMBDA + FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (acc:@[ParameterName(name = "acc")] T of .sum, e:T of .sum) returnType:T of .sum + VALUE_PARAMETER name:acc index:0 type:@[ParameterName(name = "acc")] T of .sum VALUE_PARAMETER name:e index:1 type:T of .sum BLOCK_BODY - RETURN type=kotlin.Nothing from='local final fun (acc: @[ParameterName(name = 'acc')] T of .sum, e: T of .sum): T of .sum declared in .sum' + RETURN type=kotlin.Nothing from='local final fun (acc: @[ParameterName(name = "acc")] T of .sum, e: T of .sum): T of .sum declared in .sum' CALL 'public abstract fun combine (other: T of .Monoid): T of .Monoid declared in .Monoid' type=T of .sum origin=null $this: GET_VAR '$context_receiver_0: .Monoid.sum> declared in .sum' type=.Monoid.sum> origin=null - $receiver: GET_VAR 'acc: @[ParameterName(name = 'acc')] T of .sum declared in .sum.' type=@[ParameterName(name = 'acc')] T of .sum origin=null + $receiver: GET_VAR 'acc: @[ParameterName(name = "acc")] T of .sum declared in .sum.' type=@[ParameterName(name = "acc")] T of .sum origin=null other: GET_VAR 'e: T of .sum declared in .sum.' type=T of .sum origin=null FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String BLOCK_BODY diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/monoidSum.ir.txt b/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/monoidSum.ir.txt index 260b82e57fc..7be99e70ad9 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/monoidSum.ir.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/monoidSum.ir.txt @@ -142,13 +142,13 @@ FILE fqName: fileName:/monoidSum.kt VALUE_PARAMETER name:$context_receiver_0 index:0 type:.Monoid.sum> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun sum ($context_receiver_0: .Monoid.sum>): T of .sum declared in ' - CALL 'public final fun fold (initial: R of kotlin.collections.fold, operation: kotlin.Function2<@[ParameterName(name = 'acc')] R of kotlin.collections.fold, T of kotlin.collections.fold, R of kotlin.collections.fold>): R of kotlin.collections.fold declared in kotlin.collections' type=T of .sum origin=null + CALL 'public final fun fold (initial: R of kotlin.collections.fold, operation: kotlin.Function2<@[ParameterName(name = "acc")] R of kotlin.collections.fold, T of kotlin.collections.fold, R of kotlin.collections.fold>): R of kotlin.collections.fold declared in kotlin.collections' type=T of .sum origin=null : T of .sum : T of .sum $receiver: GET_VAR ': kotlin.collections.List.sum> declared in .sum' type=kotlin.collections.List.sum> origin=null initial: CALL 'public abstract fun (): T of .Monoid declared in .Monoid' type=T of .sum origin=GET_PROPERTY $this: GET_VAR '$context_receiver_0: .Monoid.sum> declared in .sum' type=.Monoid.sum> origin=null - operation: FUN_EXPR type=kotlin.Function2<@[ParameterName(name = 'acc')] T of .sum, T of .sum, T of .sum> origin=LAMBDA + operation: FUN_EXPR type=kotlin.Function2<@[ParameterName(name = "acc")] T of .sum, T of .sum, T of .sum> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (acc:T of .sum, e:T of .sum) returnType:T of .sum VALUE_PARAMETER name:acc index:0 type:T of .sum VALUE_PARAMETER name:e index:1 type:T of .sum diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/functionalType.ir.txt b/compiler/testData/ir/irText/declarations/contextReceivers/functionalType.ir.txt index dd5443d4524..23e49e20ba0 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/functionalType.ir.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/functionalType.ir.txt @@ -78,48 +78,48 @@ FILE fqName: fileName:/functionalType.kt overridden: public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any - FUN name:f1 visibility:public modality:FINAL <> ($receiver:.R, $context_receiver_0:.C, g:@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function3<.C, .R, .Param, kotlin.Unit>) returnType:kotlin.Unit + FUN name:f1 visibility:public modality:FINAL <> ($receiver:.R, $context_receiver_0:.C, g:@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function3<.C, .R, .Param, kotlin.Unit>) returnType:kotlin.Unit contextReceiverParametersCount: 1 $receiver: VALUE_PARAMETER name: type:.R VALUE_PARAMETER name:$context_receiver_0 index:0 type:.C - VALUE_PARAMETER name:g index:1 type:@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function3<.C, .R, .Param, kotlin.Unit> + VALUE_PARAMETER name:g index:1 type:@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function3<.C, .R, .Param, kotlin.Unit> BLOCK_BODY CALL 'public abstract fun invoke (p1: P1 of kotlin.Function3, p2: P2 of kotlin.Function3, p3: P3 of kotlin.Function3): R of kotlin.Function3 declared in kotlin.Function3' type=kotlin.Unit origin=INVOKE - $this: GET_VAR 'g: @[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function3<.C, .R, .Param, kotlin.Unit> declared in .f1' type=@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function3<.C, .R, .Param, kotlin.Unit> origin=VARIABLE_AS_FUNCTION + $this: GET_VAR 'g: @[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function3<.C, .R, .Param, kotlin.Unit> declared in .f1' type=@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function3<.C, .R, .Param, kotlin.Unit> origin=VARIABLE_AS_FUNCTION p1: GET_VAR '$context_receiver_0: .C declared in .f1' type=.C origin=null p2: GET_VAR ': .R declared in .f1' type=.R origin=null p3: CONSTRUCTOR_CALL 'public constructor () declared in .Param' type=.Param origin=null - FUN name:f2 visibility:public modality:FINAL <> ($context_receiver_0:.C, g:@[ContextFunctionTypeParams(count = '1')] kotlin.Function2<.C, .Param, kotlin.Unit>) returnType:kotlin.Unit + FUN name:f2 visibility:public modality:FINAL <> ($context_receiver_0:.C, g:@[ContextFunctionTypeParams(count = 1)] kotlin.Function2<.C, .Param, kotlin.Unit>) returnType:kotlin.Unit contextReceiverParametersCount: 1 VALUE_PARAMETER name:$context_receiver_0 index:0 type:.C - VALUE_PARAMETER name:g index:1 type:@[ContextFunctionTypeParams(count = '1')] kotlin.Function2<.C, .Param, kotlin.Unit> + VALUE_PARAMETER name:g index:1 type:@[ContextFunctionTypeParams(count = 1)] kotlin.Function2<.C, .Param, kotlin.Unit> BLOCK_BODY CALL 'public abstract fun invoke (p1: P1 of kotlin.Function2, p2: P2 of kotlin.Function2): R of kotlin.Function2 declared in kotlin.Function2' type=kotlin.Unit origin=INVOKE - $this: GET_VAR 'g: @[ContextFunctionTypeParams(count = '1')] kotlin.Function2<.C, .Param, kotlin.Unit> declared in .f2' type=@[ContextFunctionTypeParams(count = '1')] kotlin.Function2<.C, .Param, kotlin.Unit> origin=VARIABLE_AS_FUNCTION + $this: GET_VAR 'g: @[ContextFunctionTypeParams(count = 1)] kotlin.Function2<.C, .Param, kotlin.Unit> declared in .f2' type=@[ContextFunctionTypeParams(count = 1)] kotlin.Function2<.C, .Param, kotlin.Unit> origin=VARIABLE_AS_FUNCTION p1: GET_VAR '$context_receiver_0: .C declared in .f2' type=.C origin=null p2: CONSTRUCTOR_CALL 'public constructor () declared in .Param' type=.Param origin=null - FUN name:f3 visibility:public modality:FINAL <> ($receiver:.R, $context_receiver_0:.C, g:@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function2<.C, .R, kotlin.Unit>) returnType:kotlin.Unit + FUN name:f3 visibility:public modality:FINAL <> ($receiver:.R, $context_receiver_0:.C, g:@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function2<.C, .R, kotlin.Unit>) returnType:kotlin.Unit contextReceiverParametersCount: 1 $receiver: VALUE_PARAMETER name: type:.R VALUE_PARAMETER name:$context_receiver_0 index:0 type:.C - VALUE_PARAMETER name:g index:1 type:@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function2<.C, .R, kotlin.Unit> + VALUE_PARAMETER name:g index:1 type:@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function2<.C, .R, kotlin.Unit> BLOCK_BODY CALL 'public abstract fun invoke (p1: P1 of kotlin.Function2, p2: P2 of kotlin.Function2): R of kotlin.Function2 declared in kotlin.Function2' type=kotlin.Unit origin=INVOKE - $this: GET_VAR 'g: @[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function2<.C, .R, kotlin.Unit> declared in .f3' type=@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function2<.C, .R, kotlin.Unit> origin=VARIABLE_AS_FUNCTION + $this: GET_VAR 'g: @[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function2<.C, .R, kotlin.Unit> declared in .f3' type=@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function2<.C, .R, kotlin.Unit> origin=VARIABLE_AS_FUNCTION p1: GET_VAR '$context_receiver_0: .C declared in .f3' type=.C origin=null p2: GET_VAR ': .R declared in .f3' type=.R origin=null - FUN name:f4 visibility:public modality:FINAL <> ($context_receiver_0:.C, g:@[ContextFunctionTypeParams(count = '1')] kotlin.Function1<.C, kotlin.Unit>) returnType:kotlin.Unit + FUN name:f4 visibility:public modality:FINAL <> ($context_receiver_0:.C, g:@[ContextFunctionTypeParams(count = 1)] kotlin.Function1<.C, kotlin.Unit>) returnType:kotlin.Unit contextReceiverParametersCount: 1 VALUE_PARAMETER name:$context_receiver_0 index:0 type:.C - VALUE_PARAMETER name:g index:1 type:@[ContextFunctionTypeParams(count = '1')] kotlin.Function1<.C, kotlin.Unit> + VALUE_PARAMETER name:g index:1 type:@[ContextFunctionTypeParams(count = 1)] kotlin.Function1<.C, kotlin.Unit> BLOCK_BODY CALL 'public abstract fun invoke (p1: P1 of kotlin.Function1): R of kotlin.Function1 declared in kotlin.Function1' type=kotlin.Unit origin=INVOKE - $this: GET_VAR 'g: @[ContextFunctionTypeParams(count = '1')] kotlin.Function1<.C, kotlin.Unit> declared in .f4' type=@[ContextFunctionTypeParams(count = '1')] kotlin.Function1<.C, kotlin.Unit> origin=VARIABLE_AS_FUNCTION + $this: GET_VAR 'g: @[ContextFunctionTypeParams(count = 1)] kotlin.Function1<.C, kotlin.Unit> declared in .f4' type=@[ContextFunctionTypeParams(count = 1)] kotlin.Function1<.C, kotlin.Unit> origin=VARIABLE_AS_FUNCTION p1: GET_VAR '$context_receiver_0: .C declared in .f4' type=.C origin=null FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY - VAR name:lf1 type:@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function3<.C, .R, .Param, kotlin.Unit> [val] - FUN_EXPR type=@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function3<.C, .R, .Param, kotlin.Unit> origin=LAMBDA + VAR name:lf1 type:@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function3<.C, .R, .Param, kotlin.Unit> [val] + FUN_EXPR type=@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function3<.C, .R, .Param, kotlin.Unit> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> ($receiver:.R, $context_receiver_0:.C, :.Param) returnType:kotlin.Unit contextReceiverParametersCount: 1 $receiver: VALUE_PARAMETER name:$this$null type:.R @@ -132,8 +132,8 @@ FILE fqName: fileName:/functionalType.kt TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit CALL 'public final fun (): kotlin.Int declared in .C' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR '$context_receiver_0: .C declared in .test.' type=.C origin=null - VAR name:lf2 type:@[ContextFunctionTypeParams(count = '1')] kotlin.Function2<.C, .Param, kotlin.Unit> [val] - FUN_EXPR type=@[ContextFunctionTypeParams(count = '1')] kotlin.Function2<.C, .Param, kotlin.Unit> origin=LAMBDA + VAR name:lf2 type:@[ContextFunctionTypeParams(count = 1)] kotlin.Function2<.C, .Param, kotlin.Unit> [val] + FUN_EXPR type=@[ContextFunctionTypeParams(count = 1)] kotlin.Function2<.C, .Param, kotlin.Unit> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> ($context_receiver_0:.C, :.Param) returnType:kotlin.Unit contextReceiverParametersCount: 1 VALUE_PARAMETER name:$context_receiver_0 index:0 type:.C @@ -142,8 +142,8 @@ FILE fqName: fileName:/functionalType.kt TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit CALL 'public final fun (): kotlin.Int declared in .C' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR '$context_receiver_0: .C declared in .test.' type=.C origin=null - VAR name:lf3 type:@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function2<.C, .R, kotlin.Unit> [val] - FUN_EXPR type=@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function2<.C, .R, kotlin.Unit> origin=LAMBDA + VAR name:lf3 type:@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function2<.C, .R, kotlin.Unit> [val] + FUN_EXPR type=@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function2<.C, .R, kotlin.Unit> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> ($receiver:.R, $context_receiver_0:.C) returnType:kotlin.Unit contextReceiverParametersCount: 1 $receiver: VALUE_PARAMETER name:$this$null type:.R @@ -155,8 +155,8 @@ FILE fqName: fileName:/functionalType.kt TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit CALL 'public final fun (): kotlin.Int declared in .C' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR '$context_receiver_0: .C declared in .test.' type=.C origin=null - VAR name:lf4 type:@[ContextFunctionTypeParams(count = '1')] kotlin.Function1<.C, kotlin.Unit> [val] - FUN_EXPR type=@[ContextFunctionTypeParams(count = '1')] kotlin.Function1<.C, kotlin.Unit> origin=LAMBDA + VAR name:lf4 type:@[ContextFunctionTypeParams(count = 1)] kotlin.Function1<.C, kotlin.Unit> [val] + FUN_EXPR type=@[ContextFunctionTypeParams(count = 1)] kotlin.Function1<.C, kotlin.Unit> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> ($context_receiver_0:.C) returnType:kotlin.Unit contextReceiverParametersCount: 1 VALUE_PARAMETER name:$context_receiver_0 index:0 type:.C @@ -180,14 +180,14 @@ FILE fqName: fileName:/functionalType.kt FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> ($receiver:.R) returnType:kotlin.Unit $receiver: VALUE_PARAMETER name:$this$with type:.R BLOCK_BODY - CALL 'public final fun f1 ($context_receiver_0: .C, g: @[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function3<.C, .R, .Param, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null + CALL 'public final fun f1 ($context_receiver_0: .C, g: @[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function3<.C, .R, .Param, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null $receiver: GET_VAR '$this$with: .R declared in .test..' type=.R origin=null $context_receiver_0: GET_VAR '$this$with: .C declared in .test.' type=.C origin=null - g: GET_VAR 'val lf1: @[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function3<.C, .R, .Param, kotlin.Unit> declared in .test' type=@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function3<.C, .R, .Param, kotlin.Unit> origin=null - CALL 'public final fun f1 ($context_receiver_0: .C, g: @[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function3<.C, .R, .Param, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null + g: GET_VAR 'val lf1: @[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function3<.C, .R, .Param, kotlin.Unit> declared in .test' type=@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function3<.C, .R, .Param, kotlin.Unit> origin=null + CALL 'public final fun f1 ($context_receiver_0: .C, g: @[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function3<.C, .R, .Param, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null $receiver: GET_VAR '$this$with: .R declared in .test..' type=.R origin=null $context_receiver_0: GET_VAR '$this$with: .C declared in .test.' type=.C origin=null - g: FUN_EXPR type=@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function3<.C, .R, .Param, kotlin.Unit> origin=LAMBDA + g: FUN_EXPR type=@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function3<.C, .R, .Param, kotlin.Unit> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> ($receiver:.R, $context_receiver_0:.C, :.Param) returnType:kotlin.Unit contextReceiverParametersCount: 1 $receiver: VALUE_PARAMETER name:$this$f1 type:.R @@ -200,12 +200,12 @@ FILE fqName: fileName:/functionalType.kt TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit CALL 'public final fun (): kotlin.Int declared in .C' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR '$this$with: .C declared in .test.' type=.C origin=null - CALL 'public final fun f2 ($context_receiver_0: .C, g: @[ContextFunctionTypeParams(count = '1')] kotlin.Function2<.C, .Param, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null + CALL 'public final fun f2 ($context_receiver_0: .C, g: @[ContextFunctionTypeParams(count = 1)] kotlin.Function2<.C, .Param, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null $context_receiver_0: GET_VAR '$this$with: .C declared in .test.' type=.C origin=null - g: GET_VAR 'val lf2: @[ContextFunctionTypeParams(count = '1')] kotlin.Function2<.C, .Param, kotlin.Unit> declared in .test' type=@[ContextFunctionTypeParams(count = '1')] kotlin.Function2<.C, .Param, kotlin.Unit> origin=null - CALL 'public final fun f2 ($context_receiver_0: .C, g: @[ContextFunctionTypeParams(count = '1')] kotlin.Function2<.C, .Param, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null + g: GET_VAR 'val lf2: @[ContextFunctionTypeParams(count = 1)] kotlin.Function2<.C, .Param, kotlin.Unit> declared in .test' type=@[ContextFunctionTypeParams(count = 1)] kotlin.Function2<.C, .Param, kotlin.Unit> origin=null + CALL 'public final fun f2 ($context_receiver_0: .C, g: @[ContextFunctionTypeParams(count = 1)] kotlin.Function2<.C, .Param, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null $context_receiver_0: GET_VAR '$this$with: .C declared in .test.' type=.C origin=null - g: FUN_EXPR type=@[ContextFunctionTypeParams(count = '1')] kotlin.Function2<.C, .Param, kotlin.Unit> origin=LAMBDA + g: FUN_EXPR type=@[ContextFunctionTypeParams(count = 1)] kotlin.Function2<.C, .Param, kotlin.Unit> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> ($context_receiver_0:.C, :.Param) returnType:kotlin.Unit contextReceiverParametersCount: 1 VALUE_PARAMETER name:$context_receiver_0 index:0 type:.C @@ -214,14 +214,14 @@ FILE fqName: fileName:/functionalType.kt TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit CALL 'public final fun (): kotlin.Int declared in .C' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR '$this$with: .C declared in .test.' type=.C origin=null - CALL 'public final fun f3 ($context_receiver_0: .C, g: @[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function2<.C, .R, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null + CALL 'public final fun f3 ($context_receiver_0: .C, g: @[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function2<.C, .R, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null $receiver: GET_VAR '$this$with: .R declared in .test..' type=.R origin=null $context_receiver_0: GET_VAR '$this$with: .C declared in .test.' type=.C origin=null - g: GET_VAR 'val lf3: @[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function2<.C, .R, kotlin.Unit> declared in .test' type=@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function2<.C, .R, kotlin.Unit> origin=null - CALL 'public final fun f3 ($context_receiver_0: .C, g: @[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function2<.C, .R, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null + g: GET_VAR 'val lf3: @[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function2<.C, .R, kotlin.Unit> declared in .test' type=@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function2<.C, .R, kotlin.Unit> origin=null + CALL 'public final fun f3 ($context_receiver_0: .C, g: @[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function2<.C, .R, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null $receiver: GET_VAR '$this$with: .R declared in .test..' type=.R origin=null $context_receiver_0: GET_VAR '$this$with: .C declared in .test.' type=.C origin=null - g: FUN_EXPR type=@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = '1')] kotlin.Function2<.C, .R, kotlin.Unit> origin=LAMBDA + g: FUN_EXPR type=@[ExtensionFunctionType] @[ContextFunctionTypeParams(count = 1)] kotlin.Function2<.C, .R, kotlin.Unit> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> ($receiver:.R, $context_receiver_0:.C) returnType:kotlin.Unit contextReceiverParametersCount: 1 $receiver: VALUE_PARAMETER name:$this$f3 type:.R @@ -233,12 +233,12 @@ FILE fqName: fileName:/functionalType.kt TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit CALL 'public final fun (): kotlin.Int declared in .C' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR '$this$with: .C declared in .test.' type=.C origin=null - CALL 'public final fun f4 ($context_receiver_0: .C, g: @[ContextFunctionTypeParams(count = '1')] kotlin.Function1<.C, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null + CALL 'public final fun f4 ($context_receiver_0: .C, g: @[ContextFunctionTypeParams(count = 1)] kotlin.Function1<.C, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null $context_receiver_0: GET_VAR '$this$with: .C declared in .test.' type=.C origin=null - g: GET_VAR 'val lf4: @[ContextFunctionTypeParams(count = '1')] kotlin.Function1<.C, kotlin.Unit> declared in .test' type=@[ContextFunctionTypeParams(count = '1')] kotlin.Function1<.C, kotlin.Unit> origin=null - CALL 'public final fun f4 ($context_receiver_0: .C, g: @[ContextFunctionTypeParams(count = '1')] kotlin.Function1<.C, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null + g: GET_VAR 'val lf4: @[ContextFunctionTypeParams(count = 1)] kotlin.Function1<.C, kotlin.Unit> declared in .test' type=@[ContextFunctionTypeParams(count = 1)] kotlin.Function1<.C, kotlin.Unit> origin=null + CALL 'public final fun f4 ($context_receiver_0: .C, g: @[ContextFunctionTypeParams(count = 1)] kotlin.Function1<.C, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null $context_receiver_0: GET_VAR '$this$with: .C declared in .test.' type=.C origin=null - g: FUN_EXPR type=@[ContextFunctionTypeParams(count = '1')] kotlin.Function1<.C, kotlin.Unit> origin=LAMBDA + g: FUN_EXPR type=@[ContextFunctionTypeParams(count = 1)] kotlin.Function1<.C, kotlin.Unit> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> ($context_receiver_0:.C) returnType:kotlin.Unit contextReceiverParametersCount: 1 VALUE_PARAMETER name:$context_receiver_0 index:0 type:.C diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/passingLambdaToContextualParam.ir.txt b/compiler/testData/ir/irText/declarations/contextReceivers/passingLambdaToContextualParam.ir.txt index ffb5be6e48f..27f6f316010 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/passingLambdaToContextualParam.ir.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/passingLambdaToContextualParam.ir.txt @@ -29,18 +29,18 @@ FILE fqName: fileName:/passingLambdaToContextualParam.kt overridden: public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any - FUN name:contextual visibility:public modality:FINAL <> (f:@[ContextFunctionTypeParams(count = '1')] kotlin.Function1<.C, kotlin.String>) returnType:kotlin.String - VALUE_PARAMETER name:f index:0 type:@[ContextFunctionTypeParams(count = '1')] kotlin.Function1<.C, kotlin.String> + FUN name:contextual visibility:public modality:FINAL <> (f:@[ContextFunctionTypeParams(count = 1)] kotlin.Function1<.C, kotlin.String>) returnType:kotlin.String + VALUE_PARAMETER name:f index:0 type:@[ContextFunctionTypeParams(count = 1)] kotlin.Function1<.C, kotlin.String> BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun contextual (f: @[ContextFunctionTypeParams(count = '1')] kotlin.Function1<.C, kotlin.String>): kotlin.String declared in ' + RETURN type=kotlin.Nothing from='public final fun contextual (f: @[ContextFunctionTypeParams(count = 1)] kotlin.Function1<.C, kotlin.String>): kotlin.String declared in ' CALL 'public abstract fun invoke (p1: P1 of kotlin.Function1): R of kotlin.Function1 declared in kotlin.Function1' type=kotlin.String origin=INVOKE - $this: GET_VAR 'f: @[ContextFunctionTypeParams(count = '1')] kotlin.Function1<.C, kotlin.String> declared in .contextual' type=@[ContextFunctionTypeParams(count = '1')] kotlin.Function1<.C, kotlin.String> origin=VARIABLE_AS_FUNCTION + $this: GET_VAR 'f: @[ContextFunctionTypeParams(count = 1)] kotlin.Function1<.C, kotlin.String> declared in .contextual' type=@[ContextFunctionTypeParams(count = 1)] kotlin.Function1<.C, kotlin.String> origin=VARIABLE_AS_FUNCTION p1: CONSTRUCTOR_CALL 'public constructor () declared in .C' type=.C origin=null 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 ' - CALL 'public final fun contextual (f: @[ContextFunctionTypeParams(count = '1')] kotlin.Function1<.C, kotlin.String>): kotlin.String declared in ' type=kotlin.String origin=null - f: FUN_EXPR type=@[ContextFunctionTypeParams(count = '1')] kotlin.Function1<.C, kotlin.String> origin=LAMBDA + CALL 'public final fun contextual (f: @[ContextFunctionTypeParams(count = 1)] kotlin.Function1<.C, kotlin.String>): kotlin.String declared in ' type=kotlin.String origin=null + f: FUN_EXPR type=@[ContextFunctionTypeParams(count = 1)] kotlin.Function1<.C, kotlin.String> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> ($context_receiver_0:.C) returnType:kotlin.String contextReceiverParametersCount: 1 VALUE_PARAMETER name:$context_receiver_0 index:0 type:.C diff --git a/compiler/testData/ir/irText/declarations/deprecatedProperty.ir.txt b/compiler/testData/ir/irText/declarations/deprecatedProperty.ir.txt index 0a83917d490..c0b695404df 100644 --- a/compiler/testData/ir/irText/declarations/deprecatedProperty.ir.txt +++ b/compiler/testData/ir/irText/declarations/deprecatedProperty.ir.txt @@ -1,7 +1,7 @@ FILE fqName: fileName:/deprecatedProperty.kt PROPERTY name:testVal visibility:public modality:FINAL [val] annotations: - Deprecated(message = '', replaceWith = , level = ) + Deprecated(message = "", replaceWith = , level = ) FIELD PROPERTY_BACKING_FIELD name:testVal type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY CONST Int type=kotlin.Int value=1 @@ -12,7 +12,7 @@ FILE fqName: fileName:/deprecatedProperty.kt GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testVal type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null PROPERTY name:testVar visibility:public modality:FINAL [var] annotations: - Deprecated(message = '', replaceWith = , level = ) + Deprecated(message = "", replaceWith = , level = ) FIELD PROPERTY_BACKING_FIELD name:testVar type:kotlin.Int visibility:private [static] EXPRESSION_BODY CONST Int type=kotlin.Int value=1 @@ -29,7 +29,7 @@ FILE fqName: fileName:/deprecatedProperty.kt value: GET_VAR ': kotlin.Int declared in .' type=kotlin.Int origin=null PROPERTY name:testValWithExplicitDefaultGet visibility:public modality:FINAL [val] annotations: - Deprecated(message = '', replaceWith = , level = ) + Deprecated(message = "", replaceWith = , level = ) FIELD PROPERTY_BACKING_FIELD name:testValWithExplicitDefaultGet type:kotlin.Int visibility:private [final,static] EXPRESSION_BODY CONST Int type=kotlin.Int value=1 @@ -40,7 +40,7 @@ FILE fqName: fileName:/deprecatedProperty.kt GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testValWithExplicitDefaultGet type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null PROPERTY name:testValWithExplicitGet visibility:public modality:FINAL [val] annotations: - Deprecated(message = '', replaceWith = , level = ) + Deprecated(message = "", replaceWith = , level = ) FUN name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:testValWithExplicitGet visibility:public modality:FINAL [val] BLOCK_BODY @@ -48,7 +48,7 @@ FILE fqName: fileName:/deprecatedProperty.kt CONST Int type=kotlin.Int value=1 PROPERTY name:testVarWithExplicitDefaultGet visibility:public modality:FINAL [var] annotations: - Deprecated(message = '', replaceWith = , level = ) + Deprecated(message = "", replaceWith = , level = ) FIELD PROPERTY_BACKING_FIELD name:testVarWithExplicitDefaultGet type:kotlin.Int visibility:private [static] EXPRESSION_BODY CONST Int type=kotlin.Int value=1 @@ -65,7 +65,7 @@ FILE fqName: fileName:/deprecatedProperty.kt value: GET_VAR ': kotlin.Int declared in .' type=kotlin.Int origin=null PROPERTY name:testVarWithExplicitDefaultSet visibility:public modality:FINAL [var] annotations: - Deprecated(message = '', replaceWith = , level = ) + Deprecated(message = "", replaceWith = , level = ) FIELD PROPERTY_BACKING_FIELD name:testVarWithExplicitDefaultSet type:kotlin.Int visibility:private [static] EXPRESSION_BODY CONST Int type=kotlin.Int value=1 @@ -82,7 +82,7 @@ FILE fqName: fileName:/deprecatedProperty.kt value: GET_VAR ': kotlin.Int declared in .' type=kotlin.Int origin=null PROPERTY name:testVarWithExplicitDefaultGetSet visibility:public modality:FINAL [var] annotations: - Deprecated(message = '', replaceWith = , level = ) + Deprecated(message = "", replaceWith = , level = ) FIELD PROPERTY_BACKING_FIELD name:testVarWithExplicitDefaultGetSet type:kotlin.Int visibility:private [static] EXPRESSION_BODY CONST Int type=kotlin.Int value=1 @@ -99,7 +99,7 @@ FILE fqName: fileName:/deprecatedProperty.kt value: GET_VAR ': kotlin.Int declared in .' type=kotlin.Int origin=null PROPERTY name:testVarWithExplicitGetSet visibility:public modality:FINAL [var] annotations: - Deprecated(message = '', replaceWith = , level = ) + Deprecated(message = "", replaceWith = , level = ) FUN name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:testVarWithExplicitGetSet visibility:public modality:FINAL [var] BLOCK_BODY @@ -111,7 +111,7 @@ FILE fqName: fileName:/deprecatedProperty.kt BLOCK_BODY PROPERTY name:testLateinitVar visibility:public modality:FINAL [lateinit,var] annotations: - Deprecated(message = '', replaceWith = , level = ) + Deprecated(message = "", replaceWith = , level = ) FIELD PROPERTY_BACKING_FIELD name:testLateinitVar type:kotlin.Any visibility:public [static] FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Any correspondingProperty: PROPERTY name:testLateinitVar visibility:public modality:FINAL [lateinit,var] @@ -126,7 +126,7 @@ FILE fqName: fileName:/deprecatedProperty.kt value: GET_VAR ': kotlin.Any declared in .' type=kotlin.Any origin=null PROPERTY name:testExtVal visibility:public modality:FINAL [val] annotations: - Deprecated(message = '', replaceWith = , level = ) + Deprecated(message = "", replaceWith = , level = ) FUN name: visibility:public modality:FINAL <> ($receiver:kotlin.Any) returnType:kotlin.Int correspondingProperty: PROPERTY name:testExtVal visibility:public modality:FINAL [val] $receiver: VALUE_PARAMETER name: type:kotlin.Any @@ -135,7 +135,7 @@ FILE fqName: fileName:/deprecatedProperty.kt CONST Int type=kotlin.Int value=1 PROPERTY name:textExtVar visibility:public modality:FINAL [var] annotations: - Deprecated(message = '', replaceWith = , level = ) + Deprecated(message = "", replaceWith = , level = ) FUN name: visibility:public modality:FINAL <> ($receiver:kotlin.Any) returnType:kotlin.Int correspondingProperty: PROPERTY name:textExtVar visibility:public modality:FINAL [var] $receiver: VALUE_PARAMETER name: type:kotlin.Any diff --git a/compiler/testData/ir/irText/declarations/fileWithAnnotations.ir.txt b/compiler/testData/ir/irText/declarations/fileWithAnnotations.ir.txt index 53dd97b4174..80febf66a35 100644 --- a/compiler/testData/ir/irText/declarations/fileWithAnnotations.ir.txt +++ b/compiler/testData/ir/irText/declarations/fileWithAnnotations.ir.txt @@ -1,6 +1,6 @@ FILE fqName: fileName:/fileWithAnnotations.kt annotations: - JvmName(name = 'FileWithAnnotations') + JvmName(name = "FileWithAnnotations") FUN name:foo visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY PROPERTY name:bar visibility:public modality:FINAL [val] diff --git a/compiler/testData/ir/irText/declarations/typeAlias.ir.txt b/compiler/testData/ir/irText/declarations/typeAlias.ir.txt index 5d69e40a1c7..751f419baed 100644 --- a/compiler/testData/ir/irText/declarations/typeAlias.ir.txt +++ b/compiler/testData/ir/irText/declarations/typeAlias.ir.txt @@ -11,7 +11,7 @@ FILE fqName: fileName:/typeAlias.kt INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[kotlin.Any]' TYPEALIAS name:TestNested visibility:public expandedType:kotlin.String annotations: - Suppress(names = ['TOPLEVEL_TYPEALIASES_ONLY']) + Suppress(names = ["TOPLEVEL_TYPEALIASES_ONLY"]) 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 declared in kotlin.Any diff --git a/compiler/testData/ir/irText/expressions/callableReferences/typeArguments.ir.txt b/compiler/testData/ir/irText/expressions/callableReferences/typeArguments.ir.txt index b5d583740d8..84a3e581088 100644 --- a/compiler/testData/ir/irText/expressions/callableReferences/typeArguments.ir.txt +++ b/compiler/testData/ir/irText/expressions/callableReferences/typeArguments.ir.txt @@ -34,7 +34,7 @@ FILE fqName: fileName:/typeArguments.kt PROPERTY name:test1 visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function1 visibility:private [final,static] EXPRESSION_BODY - FUNCTION_REFERENCE 'public final fun topLevel1 (x: T of .topLevel1): kotlin.Unit declared in ' type=kotlin.reflect.KFunction1<@[ParameterName(name = 'x')] kotlin.Int, kotlin.Unit> origin=null reflectionTarget= + FUNCTION_REFERENCE 'public final fun topLevel1 (x: T of .topLevel1): kotlin.Unit declared in ' type=kotlin.reflect.KFunction1<@[ParameterName(name = "x")] kotlin.Int, kotlin.Unit> origin=null reflectionTarget= : kotlin.Int FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Function1 correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] @@ -44,7 +44,7 @@ FILE fqName: fileName:/typeArguments.kt PROPERTY name:test2 visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Function1, kotlin.Unit> visibility:private [final,static] EXPRESSION_BODY - FUNCTION_REFERENCE 'public final fun topLevel2 (x: kotlin.collections.List.topLevel2>): kotlin.Unit declared in ' type=kotlin.reflect.KFunction1<@[ParameterName(name = 'x')] kotlin.collections.List, kotlin.Unit> origin=null reflectionTarget= + FUNCTION_REFERENCE 'public final fun topLevel2 (x: kotlin.collections.List.topLevel2>): kotlin.Unit declared in ' type=kotlin.reflect.KFunction1<@[ParameterName(name = "x")] kotlin.collections.List, kotlin.Unit> origin=null reflectionTarget= : kotlin.String FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Function1, kotlin.Unit> correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] @@ -54,7 +54,7 @@ FILE fqName: fileName:/typeArguments.kt PROPERTY name:test3 visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Function1 visibility:private [final,static] EXPRESSION_BODY - FUNCTION_REFERENCE 'public final fun objectMember (x: T of .Host.objectMember): kotlin.Unit declared in .Host' type=kotlin.reflect.KFunction1<@[ParameterName(name = 'x')] kotlin.Int, kotlin.Unit> origin=null reflectionTarget= + FUNCTION_REFERENCE 'public final fun objectMember (x: T of .Host.objectMember): kotlin.Unit declared in .Host' type=kotlin.reflect.KFunction1<@[ParameterName(name = "x")] kotlin.Int, kotlin.Unit> origin=null reflectionTarget= : kotlin.Int $this: GET_OBJECT 'CLASS OBJECT name:Host modality:FINAL visibility:public superTypes:[kotlin.Any]' type=.Host FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Function1 diff --git a/compiler/testData/ir/irText/expressions/funInterface/partialSam.ir.txt b/compiler/testData/ir/irText/expressions/funInterface/partialSam.ir.txt index bb047108649..df37a5523b6 100644 --- a/compiler/testData/ir/irText/expressions/funInterface/partialSam.ir.txt +++ b/compiler/testData/ir/irText/expressions/funInterface/partialSam.ir.txt @@ -141,7 +141,7 @@ FILE fqName: fileName:/partialSam.kt $this: GET_VAR 'j: .J declared in .test' type=.J origin=null f1: CALL 'public final fun (): .Fn declared in ' type=.Fn origin=GET_PROPERTY f2: TYPE_OP type=.Fn origin=SAM_CONVERSION typeOperand=.Fn - FUN_EXPR type=kotlin.Function3<@[ParameterName(name = 's')] kotlin.String, @[ParameterName(name = 'i')] kotlin.Int, @[ParameterName(name = 't')] kotlin.Int, kotlin.String> origin=LAMBDA + FUN_EXPR type=kotlin.Function3<@[ParameterName(name = "s")] kotlin.String, @[ParameterName(name = "i")] kotlin.Int, @[ParameterName(name = "t")] kotlin.Int, kotlin.String> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (s:kotlin.String, i:kotlin.Int, ti:kotlin.Int) returnType:kotlin.String VALUE_PARAMETER name:s index:0 type:kotlin.String VALUE_PARAMETER name:i index:1 type:kotlin.Int @@ -153,7 +153,7 @@ FILE fqName: fileName:/partialSam.kt CALL 'public final fun runConversion (f1: .Fn, f2: .Fn): kotlin.Int declared in .J' type=kotlin.Int origin=null $this: GET_VAR 'j: .J declared in .test' type=.J origin=null f1: TYPE_OP type=.Fn origin=SAM_CONVERSION typeOperand=.Fn - FUN_EXPR type=kotlin.Function3<@[ParameterName(name = 's')] kotlin.String, @[ParameterName(name = 'i')] kotlin.Int, @[ParameterName(name = 't')] kotlin.String, kotlin.Int> origin=LAMBDA + FUN_EXPR type=kotlin.Function3<@[ParameterName(name = "s")] kotlin.String, @[ParameterName(name = "i")] kotlin.Int, @[ParameterName(name = "t")] kotlin.String, kotlin.Int> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (s:kotlin.String, i:kotlin.Int, ts:kotlin.String) returnType:kotlin.Int VALUE_PARAMETER name:s index:0 type:kotlin.String VALUE_PARAMETER name:i index:1 type:kotlin.Int diff --git a/compiler/testData/ir/irText/expressions/funInterface/samConversionInVarargs.ir.txt b/compiler/testData/ir/irText/expressions/funInterface/samConversionInVarargs.ir.txt index 8973ab1565e..ea8de7b7d77 100644 --- a/compiler/testData/ir/irText/expressions/funInterface/samConversionInVarargs.ir.txt +++ b/compiler/testData/ir/irText/expressions/funInterface/samConversionInVarargs.ir.txt @@ -25,7 +25,7 @@ FILE fqName: fileName:/samConversionInVarargs.kt CALL 'public final fun useVararg (vararg foos: .IFoo): kotlin.Unit declared in ' type=kotlin.Unit origin=null foos: VARARG type=kotlin.Array.IFoo> varargElementType=.IFoo TYPE_OP type=.IFoo origin=SAM_CONVERSION typeOperand=.IFoo - FUN_EXPR type=kotlin.Function1<@[ParameterName(name = 'i')] kotlin.Int, kotlin.Unit> origin=LAMBDA + FUN_EXPR type=kotlin.Function1<@[ParameterName(name = "i")] kotlin.Int, kotlin.Unit> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (it:kotlin.Int) returnType:kotlin.Unit VALUE_PARAMETER name:it index:0 type:kotlin.Int BLOCK_BODY @@ -36,21 +36,21 @@ FILE fqName: fileName:/samConversionInVarargs.kt CALL 'public final fun useVararg (vararg foos: .IFoo): kotlin.Unit declared in ' type=kotlin.Unit origin=null foos: VARARG type=kotlin.Array.IFoo> varargElementType=.IFoo TYPE_OP type=.IFoo origin=SAM_CONVERSION typeOperand=.IFoo - FUN_EXPR type=kotlin.Function1<@[ParameterName(name = 'i')] kotlin.Int, kotlin.Unit> origin=LAMBDA + FUN_EXPR type=kotlin.Function1<@[ParameterName(name = "i")] kotlin.Int, kotlin.Unit> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (it:kotlin.Int) returnType:kotlin.Unit VALUE_PARAMETER name:it index:0 type:kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (it: kotlin.Int): kotlin.Unit declared in .testSeveralLambdas' GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit TYPE_OP type=.IFoo origin=SAM_CONVERSION typeOperand=.IFoo - FUN_EXPR type=kotlin.Function1<@[ParameterName(name = 'i')] kotlin.Int, kotlin.Unit> origin=LAMBDA + FUN_EXPR type=kotlin.Function1<@[ParameterName(name = "i")] kotlin.Int, kotlin.Unit> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (it:kotlin.Int) returnType:kotlin.Unit VALUE_PARAMETER name:it index:0 type:kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (it: kotlin.Int): kotlin.Unit declared in .testSeveralLambdas' GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit TYPE_OP type=.IFoo origin=SAM_CONVERSION typeOperand=.IFoo - FUN_EXPR type=kotlin.Function1<@[ParameterName(name = 'i')] kotlin.Int, kotlin.Unit> origin=LAMBDA + FUN_EXPR type=kotlin.Function1<@[ParameterName(name = "i")] kotlin.Int, kotlin.Unit> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (it:kotlin.Int) returnType:kotlin.Unit VALUE_PARAMETER name:it index:0 type:kotlin.Int BLOCK_BODY diff --git a/compiler/testData/ir/irText/expressions/funInterfaceConstructorReference.ir.txt b/compiler/testData/ir/irText/expressions/funInterfaceConstructorReference.ir.txt index 1121a79d1d4..94a542a7ca0 100644 --- a/compiler/testData/ir/irText/expressions/funInterfaceConstructorReference.ir.txt +++ b/compiler/testData/ir/irText/expressions/funInterfaceConstructorReference.ir.txt @@ -56,10 +56,10 @@ FILE fqName: fileName:/funInterfaceConstructorReference.kt public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any TYPEALIAS name:KCS visibility:public expandedType:.KConsumer - FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.reflect.KFunction1<@[ParameterName(name = 'function')] kotlin.Function0, .KRunnable> + FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.reflect.KFunction1<@[ParameterName(name = "function")] kotlin.Function0, .KRunnable> BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test1 (): kotlin.reflect.KFunction1<@[ParameterName(name = 'function')] kotlin.Function0, .KRunnable> declared in ' - BLOCK type=kotlin.reflect.KFunction1<@[ParameterName(name = 'function')] kotlin.Function0, .KRunnable> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE + RETURN type=kotlin.Nothing from='public final fun test1 (): kotlin.reflect.KFunction1<@[ParameterName(name = "function")] kotlin.Function0, .KRunnable> declared in ' + BLOCK type=kotlin.reflect.KFunction1<@[ParameterName(name = "function")] kotlin.Function0, .KRunnable> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE FUN ADAPTER_FOR_FUN_INTERFACE_CONSTRUCTOR name:KRunnable visibility:local modality:FINAL <> (function:kotlin.Function0) returnType:.KRunnable VALUE_PARAMETER ADAPTER_PARAMETER_FOR_CALLABLE_REFERENCE name:function index:0 type:kotlin.Function0 BLOCK_BODY @@ -68,11 +68,11 @@ FILE fqName: fileName:/funInterfaceConstructorReference.kt CALL 'public final fun CHECK_NOT_NULL (arg0: T0 of kotlin.internal.ir.CHECK_NOT_NULL?): {T0 of kotlin.internal.ir.CHECK_NOT_NULL & Any} declared in kotlin.internal.ir' type=kotlin.Function0 origin=null : kotlin.Function0 arg0: GET_VAR 'function: kotlin.Function0 declared in .test1.KRunnable' type=kotlin.Function0 origin=null - FUNCTION_REFERENCE 'local final fun KRunnable (function: kotlin.Function0): .KRunnable declared in .test1' type=kotlin.reflect.KFunction1<@[ParameterName(name = 'function')] kotlin.Function0, .KRunnable> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE reflectionTarget= - FUN name:test1a visibility:public modality:FINAL <> () returnType:kotlin.reflect.KFunction1<@[ParameterName(name = 'function')] kotlin.Function0, .KRunnable> + FUNCTION_REFERENCE 'local final fun KRunnable (function: kotlin.Function0): .KRunnable declared in .test1' type=kotlin.reflect.KFunction1<@[ParameterName(name = "function")] kotlin.Function0, .KRunnable> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE reflectionTarget= + FUN name:test1a visibility:public modality:FINAL <> () returnType:kotlin.reflect.KFunction1<@[ParameterName(name = "function")] kotlin.Function0, .KRunnable> BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test1a (): kotlin.reflect.KFunction1<@[ParameterName(name = 'function')] kotlin.Function0, .KRunnable> declared in ' - BLOCK type=kotlin.reflect.KFunction1<@[ParameterName(name = 'function')] kotlin.Function0, .KRunnable> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE + RETURN type=kotlin.Nothing from='public final fun test1a (): kotlin.reflect.KFunction1<@[ParameterName(name = "function")] kotlin.Function0, .KRunnable> declared in ' + BLOCK type=kotlin.reflect.KFunction1<@[ParameterName(name = "function")] kotlin.Function0, .KRunnable> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE FUN ADAPTER_FOR_FUN_INTERFACE_CONSTRUCTOR name:KRunnable visibility:local modality:FINAL <> (function:kotlin.Function0) returnType:.KRunnable VALUE_PARAMETER ADAPTER_PARAMETER_FOR_CALLABLE_REFERENCE name:function index:0 type:kotlin.Function0 BLOCK_BODY @@ -81,11 +81,11 @@ FILE fqName: fileName:/funInterfaceConstructorReference.kt CALL 'public final fun CHECK_NOT_NULL (arg0: T0 of kotlin.internal.ir.CHECK_NOT_NULL?): {T0 of kotlin.internal.ir.CHECK_NOT_NULL & Any} declared in kotlin.internal.ir' type=kotlin.Function0 origin=null : kotlin.Function0 arg0: GET_VAR 'function: kotlin.Function0 declared in .test1a.KRunnable' type=kotlin.Function0 origin=null - FUNCTION_REFERENCE 'local final fun KRunnable (function: kotlin.Function0): .KRunnable declared in .test1a' type=kotlin.reflect.KFunction1<@[ParameterName(name = 'function')] kotlin.Function0, .KRunnable> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE reflectionTarget= + FUNCTION_REFERENCE 'local final fun KRunnable (function: kotlin.Function0): .KRunnable declared in .test1a' type=kotlin.reflect.KFunction1<@[ParameterName(name = "function")] kotlin.Function0, .KRunnable> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE reflectionTarget= FUN name:test1b visibility:public modality:FINAL <> () returnType:kotlin.reflect.KFunction<.KRunnable> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test1b (): kotlin.reflect.KFunction<.KRunnable> declared in ' - BLOCK type=kotlin.reflect.KFunction1<@[ParameterName(name = 'function')] kotlin.Function0, .KRunnable> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE + BLOCK type=kotlin.reflect.KFunction1<@[ParameterName(name = "function")] kotlin.Function0, .KRunnable> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE FUN ADAPTER_FOR_FUN_INTERFACE_CONSTRUCTOR name:KRunnable visibility:local modality:FINAL <> (function:kotlin.Function0) returnType:.KRunnable VALUE_PARAMETER ADAPTER_PARAMETER_FOR_CALLABLE_REFERENCE name:function index:0 type:kotlin.Function0 BLOCK_BODY @@ -94,11 +94,11 @@ FILE fqName: fileName:/funInterfaceConstructorReference.kt CALL 'public final fun CHECK_NOT_NULL (arg0: T0 of kotlin.internal.ir.CHECK_NOT_NULL?): {T0 of kotlin.internal.ir.CHECK_NOT_NULL & Any} declared in kotlin.internal.ir' type=kotlin.Function0 origin=null : kotlin.Function0 arg0: GET_VAR 'function: kotlin.Function0 declared in .test1b.KRunnable' type=kotlin.Function0 origin=null - FUNCTION_REFERENCE 'local final fun KRunnable (function: kotlin.Function0): .KRunnable declared in .test1b' type=kotlin.reflect.KFunction1<@[ParameterName(name = 'function')] kotlin.Function0, .KRunnable> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE reflectionTarget= + FUNCTION_REFERENCE 'local final fun KRunnable (function: kotlin.Function0): .KRunnable declared in .test1b' type=kotlin.reflect.KFunction1<@[ParameterName(name = "function")] kotlin.Function0, .KRunnable> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE reflectionTarget= FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Function1, .KSupplier> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test2 (): kotlin.Function1, .KSupplier> declared in ' - BLOCK type=kotlin.reflect.KFunction1<@[ParameterName(name = 'function')] kotlin.Function0, .KSupplier> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE + BLOCK type=kotlin.reflect.KFunction1<@[ParameterName(name = "function")] kotlin.Function0, .KSupplier> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE FUN ADAPTER_FOR_FUN_INTERFACE_CONSTRUCTOR name:KSupplier visibility:local modality:FINAL <> (function:kotlin.Function0) returnType:.KSupplier VALUE_PARAMETER ADAPTER_PARAMETER_FOR_CALLABLE_REFERENCE name:function index:0 type:kotlin.Function0 BLOCK_BODY @@ -107,11 +107,11 @@ FILE fqName: fileName:/funInterfaceConstructorReference.kt CALL 'public final fun CHECK_NOT_NULL (arg0: T0 of kotlin.internal.ir.CHECK_NOT_NULL?): {T0 of kotlin.internal.ir.CHECK_NOT_NULL & Any} declared in kotlin.internal.ir' type=kotlin.Function0 origin=null : kotlin.Function0 arg0: GET_VAR 'function: kotlin.Function0 declared in .test2.KSupplier' type=kotlin.Function0 origin=null - FUNCTION_REFERENCE 'local final fun KSupplier (function: kotlin.Function0): .KSupplier declared in .test2' type=kotlin.reflect.KFunction1<@[ParameterName(name = 'function')] kotlin.Function0, .KSupplier> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE reflectionTarget= + FUNCTION_REFERENCE 'local final fun KSupplier (function: kotlin.Function0): .KSupplier declared in .test2' type=kotlin.reflect.KFunction1<@[ParameterName(name = "function")] kotlin.Function0, .KSupplier> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE reflectionTarget= FUN name:test2a visibility:public modality:FINAL <> () returnType:kotlin.Function1, .KSupplier> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test2a (): kotlin.Function1, .KSupplier> declared in ' - BLOCK type=kotlin.reflect.KFunction1<@[ParameterName(name = 'function')] kotlin.Function0, .KSupplier> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE + BLOCK type=kotlin.reflect.KFunction1<@[ParameterName(name = "function")] kotlin.Function0, .KSupplier> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE FUN ADAPTER_FOR_FUN_INTERFACE_CONSTRUCTOR name:KSupplier visibility:local modality:FINAL <> (function:kotlin.Function0) returnType:.KSupplier VALUE_PARAMETER ADAPTER_PARAMETER_FOR_CALLABLE_REFERENCE name:function index:0 type:kotlin.Function0 BLOCK_BODY @@ -120,43 +120,43 @@ FILE fqName: fileName:/funInterfaceConstructorReference.kt CALL 'public final fun CHECK_NOT_NULL (arg0: T0 of kotlin.internal.ir.CHECK_NOT_NULL?): {T0 of kotlin.internal.ir.CHECK_NOT_NULL & Any} declared in kotlin.internal.ir' type=kotlin.Function0 origin=null : kotlin.Function0 arg0: GET_VAR 'function: kotlin.Function0 declared in .test2a.KSupplier' type=kotlin.Function0 origin=null - FUNCTION_REFERENCE 'local final fun KSupplier (function: kotlin.Function0): .KSupplier declared in .test2a' type=kotlin.reflect.KFunction1<@[ParameterName(name = 'function')] kotlin.Function0, .KSupplier> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE reflectionTarget= + FUNCTION_REFERENCE 'local final fun KSupplier (function: kotlin.Function0): .KSupplier declared in .test2a' type=kotlin.reflect.KFunction1<@[ParameterName(name = "function")] kotlin.Function0, .KSupplier> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE reflectionTarget= FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Function1, .KConsumer> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test3 (): kotlin.Function1, .KConsumer> declared in ' - BLOCK type=kotlin.reflect.KFunction1<@[ParameterName(name = 'function')] kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit>, .KConsumer> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE - FUN ADAPTER_FOR_FUN_INTERFACE_CONSTRUCTOR name:KConsumer visibility:local modality:FINAL <> (function:kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit>) returnType:.KConsumer - VALUE_PARAMETER ADAPTER_PARAMETER_FOR_CALLABLE_REFERENCE name:function index:0 type:kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit> + BLOCK type=kotlin.reflect.KFunction1<@[ParameterName(name = "function")] kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit>, .KConsumer> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE + FUN ADAPTER_FOR_FUN_INTERFACE_CONSTRUCTOR name:KConsumer visibility:local modality:FINAL <> (function:kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit>) returnType:.KConsumer + VALUE_PARAMETER ADAPTER_PARAMETER_FOR_CALLABLE_REFERENCE name:function index:0 type:kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit> BLOCK_BODY - RETURN type=kotlin.Nothing from='local final fun KConsumer (function: kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit>): .KConsumer declared in .test3' + RETURN type=kotlin.Nothing from='local final fun KConsumer (function: kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit>): .KConsumer declared in .test3' TYPE_OP type=.KConsumer origin=SAM_CONVERSION typeOperand=.KConsumer - CALL 'public final fun CHECK_NOT_NULL (arg0: T0 of kotlin.internal.ir.CHECK_NOT_NULL?): {T0 of kotlin.internal.ir.CHECK_NOT_NULL & Any} declared in kotlin.internal.ir' type=kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit> origin=null - : kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit> - arg0: GET_VAR 'function: kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit> declared in .test3.KConsumer' type=kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit> origin=null - FUNCTION_REFERENCE 'local final fun KConsumer (function: kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit>): .KConsumer declared in .test3' type=kotlin.reflect.KFunction1<@[ParameterName(name = 'function')] kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit>, .KConsumer> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE reflectionTarget= + CALL 'public final fun CHECK_NOT_NULL (arg0: T0 of kotlin.internal.ir.CHECK_NOT_NULL?): {T0 of kotlin.internal.ir.CHECK_NOT_NULL & Any} declared in kotlin.internal.ir' type=kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit> origin=null + : kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit> + arg0: GET_VAR 'function: kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit> declared in .test3.KConsumer' type=kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit> origin=null + FUNCTION_REFERENCE 'local final fun KConsumer (function: kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit>): .KConsumer declared in .test3' type=kotlin.reflect.KFunction1<@[ParameterName(name = "function")] kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit>, .KConsumer> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE reflectionTarget= FUN name:test3a visibility:public modality:FINAL <> () returnType:kotlin.Function1, .KConsumer> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test3a (): kotlin.Function1, .KConsumer> declared in ' - BLOCK type=kotlin.reflect.KFunction1<@[ParameterName(name = 'function')] kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit>, .KConsumer> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE - FUN ADAPTER_FOR_FUN_INTERFACE_CONSTRUCTOR name:KConsumer visibility:local modality:FINAL <> (function:kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit>) returnType:.KConsumer - VALUE_PARAMETER ADAPTER_PARAMETER_FOR_CALLABLE_REFERENCE name:function index:0 type:kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit> + BLOCK type=kotlin.reflect.KFunction1<@[ParameterName(name = "function")] kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit>, .KConsumer> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE + FUN ADAPTER_FOR_FUN_INTERFACE_CONSTRUCTOR name:KConsumer visibility:local modality:FINAL <> (function:kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit>) returnType:.KConsumer + VALUE_PARAMETER ADAPTER_PARAMETER_FOR_CALLABLE_REFERENCE name:function index:0 type:kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit> BLOCK_BODY - RETURN type=kotlin.Nothing from='local final fun KConsumer (function: kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit>): .KConsumer declared in .test3a' + RETURN type=kotlin.Nothing from='local final fun KConsumer (function: kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit>): .KConsumer declared in .test3a' TYPE_OP type=.KConsumer origin=SAM_CONVERSION typeOperand=.KConsumer - CALL 'public final fun CHECK_NOT_NULL (arg0: T0 of kotlin.internal.ir.CHECK_NOT_NULL?): {T0 of kotlin.internal.ir.CHECK_NOT_NULL & Any} declared in kotlin.internal.ir' type=kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit> origin=null - : kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit> - arg0: GET_VAR 'function: kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit> declared in .test3a.KConsumer' type=kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit> origin=null - FUNCTION_REFERENCE 'local final fun KConsumer (function: kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit>): .KConsumer declared in .test3a' type=kotlin.reflect.KFunction1<@[ParameterName(name = 'function')] kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit>, .KConsumer> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE reflectionTarget= + CALL 'public final fun CHECK_NOT_NULL (arg0: T0 of kotlin.internal.ir.CHECK_NOT_NULL?): {T0 of kotlin.internal.ir.CHECK_NOT_NULL & Any} declared in kotlin.internal.ir' type=kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit> origin=null + : kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit> + arg0: GET_VAR 'function: kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit> declared in .test3a.KConsumer' type=kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit> origin=null + FUNCTION_REFERENCE 'local final fun KConsumer (function: kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit>): .KConsumer declared in .test3a' type=kotlin.reflect.KFunction1<@[ParameterName(name = "function")] kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit>, .KConsumer> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE reflectionTarget= FUN name:test3b visibility:public modality:FINAL <> () returnType:kotlin.reflect.KFunction<.KConsumer> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test3b (): kotlin.reflect.KFunction<.KConsumer> declared in ' - BLOCK type=kotlin.reflect.KFunction1<@[ParameterName(name = 'function')] kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit>, .KConsumer> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE - FUN ADAPTER_FOR_FUN_INTERFACE_CONSTRUCTOR name:KConsumer visibility:local modality:FINAL <> (function:kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit>) returnType:.KConsumer - VALUE_PARAMETER ADAPTER_PARAMETER_FOR_CALLABLE_REFERENCE name:function index:0 type:kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit> + BLOCK type=kotlin.reflect.KFunction1<@[ParameterName(name = "function")] kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit>, .KConsumer> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE + FUN ADAPTER_FOR_FUN_INTERFACE_CONSTRUCTOR name:KConsumer visibility:local modality:FINAL <> (function:kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit>) returnType:.KConsumer + VALUE_PARAMETER ADAPTER_PARAMETER_FOR_CALLABLE_REFERENCE name:function index:0 type:kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit> BLOCK_BODY - RETURN type=kotlin.Nothing from='local final fun KConsumer (function: kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit>): .KConsumer declared in .test3b' + RETURN type=kotlin.Nothing from='local final fun KConsumer (function: kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit>): .KConsumer declared in .test3b' TYPE_OP type=.KConsumer origin=SAM_CONVERSION typeOperand=.KConsumer - CALL 'public final fun CHECK_NOT_NULL (arg0: T0 of kotlin.internal.ir.CHECK_NOT_NULL?): {T0 of kotlin.internal.ir.CHECK_NOT_NULL & Any} declared in kotlin.internal.ir' type=kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit> origin=null - : kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit> - arg0: GET_VAR 'function: kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit> declared in .test3b.KConsumer' type=kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit> origin=null - FUNCTION_REFERENCE 'local final fun KConsumer (function: kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit>): .KConsumer declared in .test3b' type=kotlin.reflect.KFunction1<@[ParameterName(name = 'function')] kotlin.Function1<@[ParameterName(name = 'x')] kotlin.String, kotlin.Unit>, .KConsumer> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE reflectionTarget= + CALL 'public final fun CHECK_NOT_NULL (arg0: T0 of kotlin.internal.ir.CHECK_NOT_NULL?): {T0 of kotlin.internal.ir.CHECK_NOT_NULL & Any} declared in kotlin.internal.ir' type=kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit> origin=null + : kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit> + arg0: GET_VAR 'function: kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit> declared in .test3b.KConsumer' type=kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit> origin=null + FUNCTION_REFERENCE 'local final fun KConsumer (function: kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit>): .KConsumer declared in .test3b' type=kotlin.reflect.KFunction1<@[ParameterName(name = "function")] kotlin.Function1<@[ParameterName(name = "x")] kotlin.String, kotlin.Unit>, .KConsumer> origin=FUN_INTERFACE_CONSTRUCTOR_REFERENCE reflectionTarget= diff --git a/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.ir.txt b/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.ir.txt index 7302e8e175d..b0dd2f02d6d 100644 --- a/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.ir.txt +++ b/compiler/testData/ir/irText/expressions/sam/samConversionToGeneric.ir.txt @@ -3,7 +3,7 @@ FILE fqName: fileName:/samConversionToGeneric.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test1 (): .J declared in ' TYPE_OP type=.J origin=SAM_CONVERSION typeOperand=.J - FUN_EXPR type=kotlin.Function1<@[ParameterName(name = 'x')] @[FlexibleNullability] kotlin.String?, @[FlexibleNullability] kotlin.String?> origin=LAMBDA + FUN_EXPR type=kotlin.Function1<@[ParameterName(name = "x")] @[FlexibleNullability] kotlin.String?, @[FlexibleNullability] kotlin.String?> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (x:@[FlexibleNullability] kotlin.String?) returnType:@[FlexibleNullability] kotlin.String? VALUE_PARAMETER name:x index:0 type:@[FlexibleNullability] kotlin.String? BLOCK_BODY diff --git a/compiler/testData/ir/irText/expressions/typeAliasConstructorReference.ir.txt b/compiler/testData/ir/irText/expressions/typeAliasConstructorReference.ir.txt index 6bb60b5b68c..e98fbf608b7 100644 --- a/compiler/testData/ir/irText/expressions/typeAliasConstructorReference.ir.txt +++ b/compiler/testData/ir/irText/expressions/typeAliasConstructorReference.ir.txt @@ -63,7 +63,7 @@ FILE fqName: fileName:/typeAliasConstructorReference.kt PROPERTY name:test1 visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function1.C> visibility:private [final,static] EXPRESSION_BODY - FUNCTION_REFERENCE 'public constructor (x: kotlin.Int) declared in .C' type=kotlin.reflect.KFunction1<@[ParameterName(name = 'x')] kotlin.Int, .C> origin=null reflectionTarget= + FUNCTION_REFERENCE 'public constructor (x: kotlin.Int) declared in .C' type=kotlin.reflect.KFunction1<@[ParameterName(name = "x")] kotlin.Int, .C> origin=null reflectionTarget= FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Function1.C> correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] BLOCK_BODY @@ -72,7 +72,7 @@ FILE fqName: fileName:/typeAliasConstructorReference.kt PROPERTY name:test2 visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Function1.Host.Nested> visibility:private [final,static] EXPRESSION_BODY - FUNCTION_REFERENCE 'public constructor (x: kotlin.Int) declared in .Host.Nested' type=kotlin.reflect.KFunction1<@[ParameterName(name = 'x')] kotlin.Int, .Host.Nested> origin=null reflectionTarget= + FUNCTION_REFERENCE 'public constructor (x: kotlin.Int) declared in .Host.Nested' type=kotlin.reflect.KFunction1<@[ParameterName(name = "x")] kotlin.Int, .Host.Nested> origin=null reflectionTarget= FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Function1.Host.Nested> correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] BLOCK_BODY diff --git a/compiler/testData/ir/irText/firProblems/AbstractMutableMap.fir.ir.txt b/compiler/testData/ir/irText/firProblems/AbstractMutableMap.fir.ir.txt index a6fd0ad85f9..ce29b2d7e04 100644 --- a/compiler/testData/ir/irText/firProblems/AbstractMutableMap.fir.ir.txt +++ b/compiler/testData/ir/irText/firProblems/AbstractMutableMap.fir.ir.txt @@ -46,7 +46,7 @@ FILE fqName: fileName:/AbstractMutableMap.kt VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] K of .MyMap? FUN FAKE_OVERRIDE name:remove visibility:public modality:OPEN <> ($this:kotlin.collections.MutableMap.MyMap, V of .MyMap>, key:K of .MyMap, value:V of .MyMap) returnType:kotlin.Boolean [fake_override] annotations: - SinceKotlin(version = '1.1') + SinceKotlin(version = "1.1") PlatformDependent overridden: public open fun remove (key: K of kotlin.collections.AbstractMutableMap, value: V of kotlin.collections.AbstractMutableMap): kotlin.Boolean declared in kotlin.collections.AbstractMutableMap @@ -98,7 +98,7 @@ FILE fqName: fileName:/AbstractMutableMap.kt VALUE_PARAMETER name:p0 index:0 type:@[FlexibleNullability] K of .MyMap? FUN FAKE_OVERRIDE name:getOrDefault visibility:public modality:OPEN <> ($this:kotlin.collections.Map.MyMap, V of .MyMap>, key:K of .MyMap, defaultValue:V of .MyMap) returnType:V of .MyMap [fake_override] annotations: - SinceKotlin(version = '1.1') + SinceKotlin(version = "1.1") PlatformDependent overridden: public open fun getOrDefault (key: K of kotlin.collections.AbstractMutableMap, defaultValue: V of kotlin.collections.AbstractMutableMap): V of kotlin.collections.AbstractMutableMap declared in kotlin.collections.AbstractMutableMap diff --git a/compiler/testData/ir/irText/firProblems/AbstractMutableMap.ir.txt b/compiler/testData/ir/irText/firProblems/AbstractMutableMap.ir.txt index dd62d94ab83..35c82bf6a68 100644 --- a/compiler/testData/ir/irText/firProblems/AbstractMutableMap.ir.txt +++ b/compiler/testData/ir/irText/firProblems/AbstractMutableMap.ir.txt @@ -107,7 +107,7 @@ FILE fqName: fileName:/AbstractMutableMap.kt VALUE_PARAMETER name:key index:0 type:K of .MyMap FUN FAKE_OVERRIDE name:getOrDefault visibility:public modality:OPEN <> ($this:kotlin.collections.Map.MyMap, V of .MyMap>, key:K of .MyMap, defaultValue:V of .MyMap) returnType:V of .MyMap [fake_override] annotations: - SinceKotlin(version = '1.1') + SinceKotlin(version = "1.1") PlatformDependent overridden: public open fun getOrDefault (key: K of kotlin.collections.AbstractMutableMap, defaultValue: V of kotlin.collections.AbstractMutableMap): V of kotlin.collections.AbstractMutableMap declared in kotlin.collections.AbstractMutableMap @@ -147,7 +147,7 @@ FILE fqName: fileName:/AbstractMutableMap.kt VALUE_PARAMETER name:key index:0 type:K of .MyMap FUN FAKE_OVERRIDE name:remove visibility:public modality:OPEN <> ($this:kotlin.collections.MutableMap.MyMap, V of .MyMap>, key:K of .MyMap, value:V of .MyMap) returnType:kotlin.Boolean [fake_override] annotations: - SinceKotlin(version = '1.1') + SinceKotlin(version = "1.1") PlatformDependent overridden: public open fun remove (key: K of kotlin.collections.AbstractMutableMap, value: V of kotlin.collections.AbstractMutableMap): kotlin.Boolean declared in kotlin.collections.AbstractMutableMap diff --git a/compiler/testData/ir/irText/firProblems/AnnotationInAnnotation.ir.txt b/compiler/testData/ir/irText/firProblems/AnnotationInAnnotation.ir.txt index ff13aaeb003..e365285a4c4 100644 --- a/compiler/testData/ir/irText/firProblems/AnnotationInAnnotation.ir.txt +++ b/compiler/testData/ir/irText/firProblems/AnnotationInAnnotation.ir.txt @@ -75,7 +75,7 @@ FILE fqName: fileName:/AnnotationInAnnotation.kt $this: VALUE_PARAMETER name: type:kotlin.Any CLASS CLASS name:Test modality:FINAL visibility:public superTypes:[kotlin.Any] annotations: - State(name = '1', storages = [Storage(value = 'HELLO')]) + State(name = "1", storages = [Storage(value = "HELLO")]) $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Test CONSTRUCTOR visibility:public <> () returnType:.Test [primary] BLOCK_BODY diff --git a/compiler/testData/ir/irText/firProblems/ArrayMap.fir.ir.txt b/compiler/testData/ir/irText/firProblems/ArrayMap.fir.ir.txt index 786ad03444a..575ddf0b7fe 100644 --- a/compiler/testData/ir/irText/firProblems/ArrayMap.fir.ir.txt +++ b/compiler/testData/ir/irText/firProblems/ArrayMap.fir.ir.txt @@ -659,17 +659,17 @@ FILE fqName: fileName:/ArrayMap.kt $this: VALUE_PARAMETER name: type:.ArrayMapImpl.ArrayMapImpl> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun entries (): kotlin.collections.List<.ArrayMapImpl.Entry.ArrayMapImpl>> declared in .ArrayMapImpl' - CALL 'public final fun mapIndexedNotNull (transform: kotlin.Function2<@[ParameterName(name = 'index')] kotlin.Int, T of kotlin.collections.mapIndexedNotNull, R of kotlin.collections.mapIndexedNotNull?>): kotlin.collections.List declared in kotlin.collections' type=kotlin.collections.List<.ArrayMapImpl.Entry.ArrayMapImpl>> origin=null + CALL 'public final fun mapIndexedNotNull (transform: kotlin.Function2<@[ParameterName(name = "index")] kotlin.Int, T of kotlin.collections.mapIndexedNotNull, R of kotlin.collections.mapIndexedNotNull?>): kotlin.collections.List declared in kotlin.collections' type=kotlin.collections.List<.ArrayMapImpl.Entry.ArrayMapImpl>> origin=null : kotlin.Any? : .ArrayMapImpl.Entry.ArrayMapImpl> $receiver: CALL 'private final fun (): kotlin.Array declared in .ArrayMapImpl' type=kotlin.Array origin=GET_PROPERTY $this: GET_VAR ': .ArrayMapImpl.ArrayMapImpl> declared in .ArrayMapImpl.entries' type=.ArrayMapImpl.ArrayMapImpl> origin=null - transform: FUN_EXPR type=kotlin.Function2<@[ParameterName(name = 'index')] kotlin.Int, kotlin.Any?, .ArrayMapImpl.Entry.ArrayMapImpl>?> origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (index:@[ParameterName(name = 'index')] kotlin.Int, value:kotlin.Any?) returnType:.ArrayMapImpl.Entry.ArrayMapImpl>? - VALUE_PARAMETER name:index index:0 type:@[ParameterName(name = 'index')] kotlin.Int + transform: FUN_EXPR type=kotlin.Function2<@[ParameterName(name = "index")] kotlin.Int, kotlin.Any?, .ArrayMapImpl.Entry.ArrayMapImpl>?> origin=LAMBDA + FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (index:@[ParameterName(name = "index")] kotlin.Int, value:kotlin.Any?) returnType:.ArrayMapImpl.Entry.ArrayMapImpl>? + VALUE_PARAMETER name:index index:0 type:@[ParameterName(name = "index")] kotlin.Int VALUE_PARAMETER name:value index:1 type:kotlin.Any? BLOCK_BODY - RETURN type=kotlin.Nothing from='local final fun (index: @[ParameterName(name = 'index')] kotlin.Int, value: kotlin.Any?): .ArrayMapImpl.Entry.ArrayMapImpl>? declared in .ArrayMapImpl.entries' + RETURN type=kotlin.Nothing from='local final fun (index: @[ParameterName(name = "index")] kotlin.Int, value: kotlin.Any?): .ArrayMapImpl.Entry.ArrayMapImpl>? declared in .ArrayMapImpl.entries' WHEN type=.ArrayMapImpl.Entry.ArrayMapImpl>? origin=IF BRANCH if: CALL 'public final fun not (): kotlin.Boolean declared in kotlin.Boolean' type=kotlin.Boolean origin=EXCLEQ @@ -678,7 +678,7 @@ FILE fqName: fileName:/ArrayMap.kt arg1: CONST Null type=kotlin.Nothing? value=null then: CONSTRUCTOR_CALL 'public constructor (key: kotlin.Int, value: T of .ArrayMapImpl.Entry) declared in .ArrayMapImpl.Entry' type=.ArrayMapImpl.Entry.ArrayMapImpl> origin=null : T of .ArrayMapImpl - key: GET_VAR 'index: @[ParameterName(name = 'index')] kotlin.Int declared in .ArrayMapImpl.entries.' type=@[ParameterName(name = 'index')] kotlin.Int origin=null + key: GET_VAR 'index: @[ParameterName(name = "index")] kotlin.Int declared in .ArrayMapImpl.entries.' type=@[ParameterName(name = "index")] kotlin.Int origin=null value: TYPE_OP type=T of .ArrayMapImpl origin=CAST typeOperand=T of .ArrayMapImpl GET_VAR 'value: kotlin.Any? declared in .ArrayMapImpl.entries.' type=kotlin.Any? origin=null BRANCH diff --git a/compiler/testData/ir/irText/firProblems/ArrayMap.ir.txt b/compiler/testData/ir/irText/firProblems/ArrayMap.ir.txt index 963c13650bb..6e989e0261b 100644 --- a/compiler/testData/ir/irText/firProblems/ArrayMap.ir.txt +++ b/compiler/testData/ir/irText/firProblems/ArrayMap.ir.txt @@ -670,12 +670,12 @@ FILE fqName: fileName:/ArrayMap.kt $this: VALUE_PARAMETER name: type:.ArrayMapImpl.ArrayMapImpl> BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun entries (): kotlin.collections.List<.ArrayMapImpl.Entry.ArrayMapImpl>> declared in .ArrayMapImpl' - CALL 'public final fun mapIndexedNotNull (transform: kotlin.Function2<@[ParameterName(name = 'index')] kotlin.Int, T of kotlin.collections.mapIndexedNotNull, R of kotlin.collections.mapIndexedNotNull?>): kotlin.collections.List declared in kotlin.collections' type=kotlin.collections.List<.ArrayMapImpl.Entry.ArrayMapImpl>> origin=null + CALL 'public final fun mapIndexedNotNull (transform: kotlin.Function2<@[ParameterName(name = "index")] kotlin.Int, T of kotlin.collections.mapIndexedNotNull, R of kotlin.collections.mapIndexedNotNull?>): kotlin.collections.List declared in kotlin.collections' type=kotlin.collections.List<.ArrayMapImpl.Entry.ArrayMapImpl>> origin=null : kotlin.Any? : .ArrayMapImpl.Entry.ArrayMapImpl> $receiver: CALL 'private final fun (): kotlin.Array declared in .ArrayMapImpl' type=kotlin.Array origin=GET_PROPERTY $this: GET_VAR ': .ArrayMapImpl.ArrayMapImpl> declared in .ArrayMapImpl.entries' type=.ArrayMapImpl.ArrayMapImpl> origin=null - transform: FUN_EXPR type=kotlin.Function2<@[ParameterName(name = 'index')] kotlin.Int, kotlin.Any?, .ArrayMapImpl.Entry.ArrayMapImpl>?> origin=LAMBDA + transform: FUN_EXPR type=kotlin.Function2<@[ParameterName(name = "index")] kotlin.Int, kotlin.Any?, .ArrayMapImpl.Entry.ArrayMapImpl>?> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (index:kotlin.Int, value:kotlin.Any?) returnType:.ArrayMapImpl.Entry.ArrayMapImpl>? VALUE_PARAMETER name:index index:0 type:kotlin.Int VALUE_PARAMETER name:value index:1 type:kotlin.Any? diff --git a/compiler/testData/ir/irText/firProblems/TypeParameterBounds.ir.txt b/compiler/testData/ir/irText/firProblems/TypeParameterBounds.ir.txt index 24b279bc2e9..36564763d3c 100644 --- a/compiler/testData/ir/irText/firProblems/TypeParameterBounds.ir.txt +++ b/compiler/testData/ir/irText/firProblems/TypeParameterBounds.ir.txt @@ -170,7 +170,7 @@ FILE fqName: fileName:/TypeParameterBounds.kt $this: VALUE_PARAMETER name: type:kotlin.Any CLASS CLASS name:InterfaceBound modality:FINAL visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.InterfaceBound.InterfaceBound> - TYPE_PARAMETER name:T index:0 variance: superTypes:[@[TypeAnn(name = 'Simple')] .Simple] reified:false + TYPE_PARAMETER name:T index:0 variance: superTypes:[@[TypeAnn(name = "Simple")] .Simple] reified:false annotations: TypeParameterAnn CONSTRUCTOR visibility:public <> () returnType:.InterfaceBound.InterfaceBound> [primary] @@ -192,7 +192,7 @@ FILE fqName: fileName:/TypeParameterBounds.kt $this: VALUE_PARAMETER name: type:kotlin.Any CLASS CLASS name:ClassBound modality:FINAL visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.ClassBound.ClassBound> - TYPE_PARAMETER name:T index:0 variance: superTypes:[@[TypeAnn(name = 'Simple')] .SimpleClass] reified:false + TYPE_PARAMETER name:T index:0 variance: superTypes:[@[TypeAnn(name = "Simple")] .SimpleClass] reified:false annotations: TypeParameterAnn CONSTRUCTOR visibility:public <> () returnType:.ClassBound.ClassBound> [primary] @@ -214,7 +214,7 @@ FILE fqName: fileName:/TypeParameterBounds.kt $this: VALUE_PARAMETER name: type:kotlin.Any CLASS CLASS name:InterfaceBoundGeneric modality:FINAL visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.InterfaceBoundGeneric.InterfaceBoundGeneric> - TYPE_PARAMETER name:T index:0 variance: superTypes:[@[TypeAnn(name = 'Generic')] .Generic<@[TypeAnn(name = 'Simple')] .Simple>] reified:false + TYPE_PARAMETER name:T index:0 variance: superTypes:[@[TypeAnn(name = "Generic")] .Generic<@[TypeAnn(name = "Simple")] .Simple>] reified:false CONSTRUCTOR visibility:public <> () returnType:.InterfaceBoundGeneric.InterfaceBoundGeneric> [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in kotlin.Any' @@ -234,7 +234,7 @@ FILE fqName: fileName:/TypeParameterBounds.kt $this: VALUE_PARAMETER name: type:kotlin.Any CLASS CLASS name:ClassBoundGeneric modality:FINAL visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.ClassBoundGeneric.ClassBoundGeneric> - TYPE_PARAMETER name:T index:0 variance: superTypes:[@[TypeAnn(name = 'GenericClass')] .GenericClass<@[TypeAnn(name = 'SimpleClass')] .SimpleClass>] reified:false + TYPE_PARAMETER name:T index:0 variance: superTypes:[@[TypeAnn(name = "GenericClass")] .GenericClass<@[TypeAnn(name = "SimpleClass")] .SimpleClass>] reified:false CONSTRUCTOR visibility:public <> () returnType:.ClassBoundGeneric.ClassBoundGeneric> [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in kotlin.Any' @@ -255,7 +255,7 @@ FILE fqName: fileName:/TypeParameterBounds.kt CLASS CLASS name:TypeParameterAsBound modality:FINAL visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.TypeParameterAsBound.TypeParameterAsBound, T of .TypeParameterAsBound> TYPE_PARAMETER name:Y index:0 variance: superTypes:[kotlin.Any?] reified:false - TYPE_PARAMETER name:T index:1 variance: superTypes:[@[TypeAnn(name = 'Y as Bound')] Y of .TypeParameterAsBound] reified:false + TYPE_PARAMETER name:T index:1 variance: superTypes:[@[TypeAnn(name = "Y as Bound")] Y of .TypeParameterAsBound] reified:false annotations: TypeParameterAnn CONSTRUCTOR visibility:public <> () returnType:.TypeParameterAsBound.TypeParameterAsBound, T of .TypeParameterAsBound> [primary] diff --git a/compiler/testData/ir/irText/firProblems/deprecated.ir.txt b/compiler/testData/ir/irText/firProblems/deprecated.ir.txt index 8e6406d7db2..84806addecf 100644 --- a/compiler/testData/ir/irText/firProblems/deprecated.ir.txt +++ b/compiler/testData/ir/irText/firProblems/deprecated.ir.txt @@ -5,14 +5,14 @@ FILE fqName: fileName:/deprecated.kt CONST String type=kotlin.String value="OK" FUN name:create visibility:public modality:FINAL <> (s:kotlin.String) returnType:kotlin.String annotations: - Deprecated(message = 'Use create() instead()', replaceWith = ReplaceWith(expression = 'create()', imports = []), level = ) + Deprecated(message = "Use create() instead()", replaceWith = ReplaceWith(expression = "create()", imports = []), level = ) VALUE_PARAMETER name:s index:0 type:kotlin.String BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun create (s: kotlin.String): kotlin.String declared in ' CALL 'public final fun create (): kotlin.String declared in ' type=kotlin.String origin=null FUN name:create visibility:public modality:FINAL <> (b:kotlin.Boolean) returnType:kotlin.String annotations: - Deprecated(message = 'Use create() instead()', replaceWith = , level = ) + Deprecated(message = "Use create() instead()", replaceWith = , level = ) VALUE_PARAMETER name:b index:0 type:kotlin.Boolean BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun create (b: kotlin.Boolean): kotlin.String declared in ' diff --git a/compiler/testData/ir/irText/firProblems/kt19251.ir.txt b/compiler/testData/ir/irText/firProblems/kt19251.ir.txt index a806d2e391d..41cd3dada4f 100644 --- a/compiler/testData/ir/irText/firProblems/kt19251.ir.txt +++ b/compiler/testData/ir/irText/firProblems/kt19251.ir.txt @@ -7,7 +7,7 @@ FILE fqName: fileName:/test.kt : kotlin.String VAR name:fn type:.Fun [val] TYPE_OP type=.Fun origin=SAM_CONVERSION typeOperand=.Fun - FUN_EXPR type=kotlin.Function1<@[ParameterName(name = 'string')] @[FlexibleNullability] kotlin.String?, @[FlexibleNullability] kotlin.String?> origin=LAMBDA + FUN_EXPR type=kotlin.Function1<@[ParameterName(name = "string")] @[FlexibleNullability] kotlin.String?, @[FlexibleNullability] kotlin.String?> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (it:@[FlexibleNullability] kotlin.String?) returnType:@[FlexibleNullability] kotlin.String? VALUE_PARAMETER name:it index:0 type:@[FlexibleNullability] kotlin.String? BLOCK_BODY diff --git a/compiler/testData/ir/irText/firProblems/kt43342.fir.ir.txt b/compiler/testData/ir/irText/firProblems/kt43342.fir.ir.txt index d6b7f90045a..f42ffaca7ed 100644 --- a/compiler/testData/ir/irText/firProblems/kt43342.fir.ir.txt +++ b/compiler/testData/ir/irText/firProblems/kt43342.fir.ir.txt @@ -115,7 +115,7 @@ FILE fqName: fileName:/kt43342.kt receiver: GET_VAR ': .ControlFlowInfo.ControlFlowInfo, V of .ControlFlowInfo> declared in .ControlFlowInfo.' type=.ControlFlowInfo.ControlFlowInfo, V of .ControlFlowInfo> origin=null FUN FAKE_OVERRIDE name:getOrDefault visibility:public modality:OPEN <> ($this:kotlin.collections.Map.ControlFlowInfo, V of .ControlFlowInfo>, key:K of .ControlFlowInfo, defaultValue:V of .ControlFlowInfo) returnType:V of .ControlFlowInfo [fake_override] annotations: - SinceKotlin(version = '1.1') + SinceKotlin(version = "1.1") PlatformDependent overridden: public open fun getOrDefault (key: K of kotlin.collections.Map, defaultValue: V of kotlin.collections.Map): V of kotlin.collections.Map declared in kotlin.collections.Map @@ -180,7 +180,7 @@ FILE fqName: fileName:/kt43342.kt VALUE_PARAMETER name:key index:0 type:kotlin.String FUN FAKE_OVERRIDE name:getOrDefault visibility:public modality:OPEN <> ($this:kotlin.collections.Map, key:kotlin.String, defaultValue:kotlin.String) returnType:kotlin.String [fake_override] annotations: - SinceKotlin(version = '1.1') + SinceKotlin(version = "1.1") PlatformDependent overridden: public open fun getOrDefault (key: K of .ControlFlowInfo, defaultValue: V of .ControlFlowInfo): V of .ControlFlowInfo declared in .ControlFlowInfo diff --git a/compiler/testData/ir/irText/firProblems/localCompanion.ir.txt b/compiler/testData/ir/irText/firProblems/localCompanion.ir.txt index fc557494421..210feb0d52e 100644 --- a/compiler/testData/ir/irText/firProblems/localCompanion.ir.txt +++ b/compiler/testData/ir/irText/firProblems/localCompanion.ir.txt @@ -9,7 +9,7 @@ FILE fqName: fileName:/localCompanion.kt INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Foo modality:FINAL visibility:local superTypes:[kotlin.Any]' CLASS OBJECT name:Companion modality:FINAL visibility:local [companion] superTypes:[kotlin.Any] annotations: - Suppress(names = ['WRONG_MODIFIER_CONTAINING_DECLARATION']) + Suppress(names = ["WRONG_MODIFIER_CONTAINING_DECLARATION"]) $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.main.Foo.Companion CONSTRUCTOR visibility:private <> () returnType:.main.Foo.Companion [primary] BLOCK_BODY diff --git a/compiler/testData/ir/irText/firProblems/valueClassEquals.ir.txt b/compiler/testData/ir/irText/firProblems/valueClassEquals.ir.txt index ac9e83162e4..028777d3c2f 100644 --- a/compiler/testData/ir/irText/firProblems/valueClassEquals.ir.txt +++ b/compiler/testData/ir/irText/firProblems/valueClassEquals.ir.txt @@ -68,11 +68,11 @@ FILE fqName: fileName:/valueClassEquals.kt RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in .Z' CONST Boolean type=kotlin.Boolean value=true PROPERTY name:equals visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:equals type:kotlin.reflect.KFunction2<.Z, @[ParameterName(name = 'other')] kotlin.Any?, kotlin.Boolean> visibility:private [final,static] + FIELD PROPERTY_BACKING_FIELD name:equals type:kotlin.reflect.KFunction2<.Z, @[ParameterName(name = "other")] kotlin.Any?, kotlin.Boolean> visibility:private [final,static] EXPRESSION_BODY - FUNCTION_REFERENCE 'public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in .Z' type=kotlin.reflect.KFunction2<.Z, @[ParameterName(name = 'other')] kotlin.Any?, kotlin.Boolean> origin=null reflectionTarget= - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.reflect.KFunction2<.Z, @[ParameterName(name = 'other')] kotlin.Any?, kotlin.Boolean> + FUNCTION_REFERENCE 'public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in .Z' type=kotlin.reflect.KFunction2<.Z, @[ParameterName(name = "other")] kotlin.Any?, kotlin.Boolean> origin=null reflectionTarget= + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.reflect.KFunction2<.Z, @[ParameterName(name = "other")] kotlin.Any?, kotlin.Boolean> correspondingProperty: PROPERTY name:equals visibility:public modality:FINAL [val] BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KFunction2<.Z, @[ParameterName(name = 'other')] kotlin.Any?, kotlin.Boolean> declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:equals type:kotlin.reflect.KFunction2<.Z, @[ParameterName(name = 'other')] kotlin.Any?, kotlin.Boolean> visibility:private [final,static]' type=kotlin.reflect.KFunction2<.Z, @[ParameterName(name = 'other')] kotlin.Any?, kotlin.Boolean> origin=null + RETURN type=kotlin.Nothing from='public final fun (): kotlin.reflect.KFunction2<.Z, @[ParameterName(name = "other")] kotlin.Any?, kotlin.Boolean> declared in ' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:equals type:kotlin.reflect.KFunction2<.Z, @[ParameterName(name = "other")] kotlin.Any?, kotlin.Boolean> visibility:private [final,static]' type=kotlin.reflect.KFunction2<.Z, @[ParameterName(name = "other")] kotlin.Any?, kotlin.Boolean> origin=null diff --git a/compiler/testData/ir/irText/stubs/constFromBuiltins.__kotlin.Int.fir.ir.txt b/compiler/testData/ir/irText/stubs/constFromBuiltins.__kotlin.Int.fir.ir.txt index b7db9fc733f..3aebfc4a077 100644 --- a/compiler/testData/ir/irText/stubs/constFromBuiltins.__kotlin.Int.fir.ir.txt +++ b/compiler/testData/ir/irText/stubs/constFromBuiltins.__kotlin.Int.fir.ir.txt @@ -19,7 +19,7 @@ CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Int modality:FINAL visibility:publ $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:kotlin.Int.Companion PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SIZE_BITS visibility:public modality:FINAL [const,val] annotations: - SinceKotlin(version = '1.3') + SinceKotlin(version = "1.3") FIELD PROPERTY_BACKING_FIELD name:SIZE_BITS type:kotlin.Int visibility:public [final] EXPRESSION_BODY CONST Int type=kotlin.Int value=32 @@ -28,7 +28,7 @@ CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Int modality:FINAL visibility:publ $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:kotlin.Int.Companion PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SIZE_BYTES visibility:public modality:FINAL [const,val] annotations: - SinceKotlin(version = '1.3') + SinceKotlin(version = "1.3") FIELD PROPERTY_BACKING_FIELD name:SIZE_BYTES type:kotlin.Int visibility:public [final] EXPRESSION_BODY CONST Int type=kotlin.Int value=4 @@ -211,61 +211,61 @@ CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Int modality:FINAL visibility:publ VALUE_PARAMETER name:other index:0 type:kotlin.Short FUN IR_EXTERNAL_DECLARATION_STUB name:rangeUntil visibility:public modality:FINAL <> ($this:kotlin.Int, other:kotlin.Byte) returnType:kotlin.ranges.IntRange [operator] annotations: - SinceKotlin(version = '1.9') + SinceKotlin(version = "1.9") WasExperimental(markerClass = [CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalStdlibApi modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass]) $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:kotlin.Int VALUE_PARAMETER name:other index:0 type:kotlin.Byte FUN IR_EXTERNAL_DECLARATION_STUB name:rangeUntil visibility:public modality:FINAL <> ($this:kotlin.Int, other:kotlin.Int) returnType:kotlin.ranges.IntRange [operator] annotations: - SinceKotlin(version = '1.9') + SinceKotlin(version = "1.9") WasExperimental(markerClass = [CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalStdlibApi modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass]) $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:kotlin.Int VALUE_PARAMETER name:other index:0 type:kotlin.Int FUN IR_EXTERNAL_DECLARATION_STUB name:rangeUntil visibility:public modality:FINAL <> ($this:kotlin.Int, other:kotlin.Long) returnType:kotlin.ranges.LongRange [operator] annotations: - SinceKotlin(version = '1.9') + SinceKotlin(version = "1.9") WasExperimental(markerClass = [CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalStdlibApi modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass]) $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:kotlin.Int VALUE_PARAMETER name:other index:0 type:kotlin.Long FUN IR_EXTERNAL_DECLARATION_STUB name:rangeUntil visibility:public modality:FINAL <> ($this:kotlin.Int, other:kotlin.Short) returnType:kotlin.ranges.IntRange [operator] annotations: - SinceKotlin(version = '1.9') + SinceKotlin(version = "1.9") WasExperimental(markerClass = [CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalStdlibApi modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass]) $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:kotlin.Int VALUE_PARAMETER name:other index:0 type:kotlin.Short FUN IR_EXTERNAL_DECLARATION_STUB name:rem visibility:public modality:FINAL <> ($this:kotlin.Int, other:kotlin.Byte) returnType:kotlin.Int [operator] annotations: - SinceKotlin(version = '1.1') + SinceKotlin(version = "1.1") IntrinsicConstEvaluation $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:kotlin.Int VALUE_PARAMETER name:other index:0 type:kotlin.Byte FUN IR_EXTERNAL_DECLARATION_STUB name:rem visibility:public modality:FINAL <> ($this:kotlin.Int, other:kotlin.Double) returnType:kotlin.Double [operator] annotations: - SinceKotlin(version = '1.1') + SinceKotlin(version = "1.1") IntrinsicConstEvaluation $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:kotlin.Int VALUE_PARAMETER name:other index:0 type:kotlin.Double FUN IR_EXTERNAL_DECLARATION_STUB name:rem visibility:public modality:FINAL <> ($this:kotlin.Int, other:kotlin.Float) returnType:kotlin.Float [operator] annotations: - SinceKotlin(version = '1.1') + SinceKotlin(version = "1.1") IntrinsicConstEvaluation $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:kotlin.Int VALUE_PARAMETER name:other index:0 type:kotlin.Float FUN IR_EXTERNAL_DECLARATION_STUB name:rem visibility:public modality:FINAL <> ($this:kotlin.Int, other:kotlin.Int) returnType:kotlin.Int [operator] annotations: - SinceKotlin(version = '1.1') + SinceKotlin(version = "1.1") IntrinsicConstEvaluation $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:kotlin.Int VALUE_PARAMETER name:other index:0 type:kotlin.Int FUN IR_EXTERNAL_DECLARATION_STUB name:rem visibility:public modality:FINAL <> ($this:kotlin.Int, other:kotlin.Long) returnType:kotlin.Long [operator] annotations: - SinceKotlin(version = '1.1') + SinceKotlin(version = "1.1") IntrinsicConstEvaluation $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:kotlin.Int VALUE_PARAMETER name:other index:0 type:kotlin.Long FUN IR_EXTERNAL_DECLARATION_STUB name:rem visibility:public modality:FINAL <> ($this:kotlin.Int, other:kotlin.Short) returnType:kotlin.Int [operator] annotations: - SinceKotlin(version = '1.1') + SinceKotlin(version = "1.1") IntrinsicConstEvaluation $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:kotlin.Int VALUE_PARAMETER name:other index:0 type:kotlin.Short diff --git a/compiler/testData/ir/irText/stubs/constFromBuiltins.__kotlin.Int.ir.txt b/compiler/testData/ir/irText/stubs/constFromBuiltins.__kotlin.Int.ir.txt index 65b6e4c39b1..06edb29168f 100644 --- a/compiler/testData/ir/irText/stubs/constFromBuiltins.__kotlin.Int.ir.txt +++ b/compiler/testData/ir/irText/stubs/constFromBuiltins.__kotlin.Int.ir.txt @@ -167,61 +167,61 @@ CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Int modality:FINAL visibility:publ VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:kotlin.Short FUN IR_EXTERNAL_DECLARATION_STUB name:rangeUntil visibility:public modality:FINAL <> ($this:kotlin.Int, other:kotlin.Byte) returnType:kotlin.ranges.IntRange [operator] annotations: - SinceKotlin(version = '1.9') + SinceKotlin(version = "1.9") WasExperimental(markerClass = [CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalStdlibApi modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass]) $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:kotlin.Int VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:kotlin.Byte FUN IR_EXTERNAL_DECLARATION_STUB name:rangeUntil visibility:public modality:FINAL <> ($this:kotlin.Int, other:kotlin.Int) returnType:kotlin.ranges.IntRange [operator] annotations: - SinceKotlin(version = '1.9') + SinceKotlin(version = "1.9") WasExperimental(markerClass = [CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalStdlibApi modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass]) $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:kotlin.Int VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:kotlin.Int FUN IR_EXTERNAL_DECLARATION_STUB name:rangeUntil visibility:public modality:FINAL <> ($this:kotlin.Int, other:kotlin.Long) returnType:kotlin.ranges.LongRange [operator] annotations: - SinceKotlin(version = '1.9') + SinceKotlin(version = "1.9") WasExperimental(markerClass = [CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalStdlibApi modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass]) $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:kotlin.Int VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:kotlin.Long FUN IR_EXTERNAL_DECLARATION_STUB name:rangeUntil visibility:public modality:FINAL <> ($this:kotlin.Int, other:kotlin.Short) returnType:kotlin.ranges.IntRange [operator] annotations: - SinceKotlin(version = '1.9') + SinceKotlin(version = "1.9") WasExperimental(markerClass = [CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB ANNOTATION_CLASS name:ExperimentalStdlibApi modality:OPEN visibility:public superTypes:[kotlin.Annotation]' type=kotlin.reflect.KClass]) $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:kotlin.Int VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:kotlin.Short FUN IR_EXTERNAL_DECLARATION_STUB name:rem visibility:public modality:FINAL <> ($this:kotlin.Int, other:kotlin.Byte) returnType:kotlin.Int [operator] annotations: - SinceKotlin(version = '1.1') + SinceKotlin(version = "1.1") IntrinsicConstEvaluation $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:kotlin.Int VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:kotlin.Byte FUN IR_EXTERNAL_DECLARATION_STUB name:rem visibility:public modality:FINAL <> ($this:kotlin.Int, other:kotlin.Double) returnType:kotlin.Double [operator] annotations: - SinceKotlin(version = '1.1') + SinceKotlin(version = "1.1") IntrinsicConstEvaluation $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:kotlin.Int VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:kotlin.Double FUN IR_EXTERNAL_DECLARATION_STUB name:rem visibility:public modality:FINAL <> ($this:kotlin.Int, other:kotlin.Float) returnType:kotlin.Float [operator] annotations: - SinceKotlin(version = '1.1') + SinceKotlin(version = "1.1") IntrinsicConstEvaluation $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:kotlin.Int VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:kotlin.Float FUN IR_EXTERNAL_DECLARATION_STUB name:rem visibility:public modality:FINAL <> ($this:kotlin.Int, other:kotlin.Int) returnType:kotlin.Int [operator] annotations: - SinceKotlin(version = '1.1') + SinceKotlin(version = "1.1") IntrinsicConstEvaluation $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:kotlin.Int VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:kotlin.Int FUN IR_EXTERNAL_DECLARATION_STUB name:rem visibility:public modality:FINAL <> ($this:kotlin.Int, other:kotlin.Long) returnType:kotlin.Long [operator] annotations: - SinceKotlin(version = '1.1') + SinceKotlin(version = "1.1") IntrinsicConstEvaluation $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:kotlin.Int VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:kotlin.Long FUN IR_EXTERNAL_DECLARATION_STUB name:rem visibility:public modality:FINAL <> ($this:kotlin.Int, other:kotlin.Short) returnType:kotlin.Int [operator] annotations: - SinceKotlin(version = '1.1') + SinceKotlin(version = "1.1") IntrinsicConstEvaluation $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:kotlin.Int VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name:other index:0 type:kotlin.Short @@ -351,7 +351,7 @@ CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Int modality:FINAL visibility:publ $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:kotlin.Int.Companion PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SIZE_BITS visibility:public modality:FINAL [const,val] annotations: - SinceKotlin(version = '1.3') + SinceKotlin(version = "1.3") FIELD IR_EXTERNAL_DECLARATION_STUB name:SIZE_BITS type:kotlin.Int visibility:public [final] EXPRESSION_BODY CONST Int type=kotlin.Int value=32 @@ -360,7 +360,7 @@ CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:Int modality:FINAL visibility:publ $this: VALUE_PARAMETER IR_EXTERNAL_DECLARATION_STUB name: type:kotlin.Int.Companion PROPERTY IR_EXTERNAL_DECLARATION_STUB name:SIZE_BYTES visibility:public modality:FINAL [const,val] annotations: - SinceKotlin(version = '1.3') + SinceKotlin(version = "1.3") FIELD IR_EXTERNAL_DECLARATION_STUB name:SIZE_BYTES type:kotlin.Int visibility:public [final] EXPRESSION_BODY CONST Int type=kotlin.Int value=4 diff --git a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.fir.ir.txt b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.fir.ir.txt index 2fc9d4a76c0..855b09208ee 100644 --- a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.fir.ir.txt +++ b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.fir.ir.txt @@ -24,12 +24,12 @@ FILE fqName: fileName:/castsInsideCoroutineInference.kt $this: GET_VAR 'block: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.CoroutineScope, .FlowCollector.scopedFlow>, kotlin.Unit> declared in .scopedFlow' type=@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.CoroutineScope, .FlowCollector.scopedFlow>, kotlin.Unit> origin=VARIABLE_AS_FUNCTION p1: GET_VAR '$this$flowScope: .CoroutineScope declared in .scopedFlow..' type=.CoroutineScope origin=null p2: GET_VAR 'val collector: .FlowCollector.scopedFlow> declared in .scopedFlow.' type=.FlowCollector.scopedFlow> origin=null - FUN name:onCompletion visibility:public modality:FINAL ($receiver:.Flow.onCompletion>, action:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit>) returnType:.Flow.onCompletion> + FUN name:onCompletion visibility:public modality:FINAL ($receiver:.Flow.onCompletion>, action:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit>) returnType:.Flow.onCompletion> TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false $receiver: VALUE_PARAMETER name: type:.Flow.onCompletion> - VALUE_PARAMETER name:action index:0 type:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit> + VALUE_PARAMETER name:action index:0 type:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit> BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun onCompletion (action: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit>): .Flow.onCompletion> declared in ' + RETURN type=kotlin.Nothing from='public final fun onCompletion (action: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit>): .Flow.onCompletion> declared in ' CALL 'public final fun unsafeFlow (block: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<.FlowCollector.unsafeFlow>, kotlin.Unit>): .Flow.unsafeFlow> declared in ' type=.Flow.onCompletion> origin=null : T of .onCompletion block: FUN_EXPR type=@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<.FlowCollector.onCompletion>, kotlin.Unit> origin=LAMBDA @@ -40,14 +40,14 @@ FILE fqName: fileName:/castsInsideCoroutineInference.kt CONSTRUCTOR_CALL 'public constructor (collector: .FlowCollector.SafeCollector>) declared in .SafeCollector' type=.SafeCollector.onCompletion> origin=null : T of .onCompletion collector: GET_VAR '$this$unsafeFlow: .FlowCollector.onCompletion> declared in .onCompletion.' type=.FlowCollector.onCompletion> origin=null - CALL 'public final fun invokeSafely (action: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.invokeSafely>, @[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null + CALL 'public final fun invokeSafely (action: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.invokeSafely>, @[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null : T of .onCompletion $receiver: GET_VAR 'val safeCollector: .SafeCollector.onCompletion> declared in .onCompletion.' type=.SafeCollector.onCompletion> origin=null - action: GET_VAR 'action: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit> declared in .onCompletion' type=@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit> origin=null - FUN name:invokeSafely visibility:public modality:FINAL ($receiver:.FlowCollector.invokeSafely>, action:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.invokeSafely>, @[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit>) returnType:kotlin.Unit [suspend] + action: GET_VAR 'action: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit> declared in .onCompletion' type=@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit> origin=null + FUN name:invokeSafely visibility:public modality:FINAL ($receiver:.FlowCollector.invokeSafely>, action:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.invokeSafely>, @[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit>) returnType:kotlin.Unit [suspend] TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false $receiver: VALUE_PARAMETER name: type:.FlowCollector.invokeSafely> - VALUE_PARAMETER name:action index:0 type:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.invokeSafely>, @[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit> + VALUE_PARAMETER name:action index:0 type:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.invokeSafely>, @[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit> BLOCK_BODY FUN name:unsafeFlow visibility:public modality:FINAL (block:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<.FlowCollector.unsafeFlow>, kotlin.Unit>) returnType:.Flow.unsafeFlow> [inline] annotations: @@ -57,25 +57,25 @@ FILE fqName: fileName:/castsInsideCoroutineInference.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun unsafeFlow (block: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<.FlowCollector.unsafeFlow>, kotlin.Unit>): .Flow.unsafeFlow> declared in ' CALL 'public final fun TODO (): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null - FUN name:onCompletion visibility:public modality:FINAL ($receiver:.Flow.onCompletion>, action:kotlin.coroutines.SuspendFunction1<@[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit>) returnType:.Flow.onCompletion> + FUN name:onCompletion visibility:public modality:FINAL ($receiver:.Flow.onCompletion>, action:kotlin.coroutines.SuspendFunction1<@[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit>) returnType:.Flow.onCompletion> annotations: - Deprecated(message = 'binary compatibility with a version w/o FlowCollector receiver', replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "binary compatibility with a version w/o FlowCollector receiver", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false $receiver: VALUE_PARAMETER name: type:.Flow.onCompletion> - VALUE_PARAMETER name:action index:0 type:kotlin.coroutines.SuspendFunction1<@[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit> + VALUE_PARAMETER name:action index:0 type:kotlin.coroutines.SuspendFunction1<@[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit> BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun onCompletion (action: kotlin.coroutines.SuspendFunction1<@[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit>): .Flow.onCompletion> declared in ' - CALL 'public final fun onCompletion (action: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit>): .Flow.onCompletion> declared in ' type=.Flow.onCompletion> origin=null + RETURN type=kotlin.Nothing from='public final fun onCompletion (action: kotlin.coroutines.SuspendFunction1<@[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit>): .Flow.onCompletion> declared in ' + CALL 'public final fun onCompletion (action: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit>): .Flow.onCompletion> declared in ' type=.Flow.onCompletion> origin=null : T of .onCompletion $receiver: GET_VAR ': .Flow.onCompletion> declared in .onCompletion' type=.Flow.onCompletion> origin=null - action: FUN_EXPR type=@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit> origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> ($receiver:.FlowCollector.onCompletion>, it:@[ParameterName(name = 'cause')] kotlin.Throwable?) returnType:kotlin.Unit [suspend] + action: FUN_EXPR type=@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit> origin=LAMBDA + FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> ($receiver:.FlowCollector.onCompletion>, it:@[ParameterName(name = "cause")] kotlin.Throwable?) returnType:kotlin.Unit [suspend] $receiver: VALUE_PARAMETER name:$this$onCompletion type:.FlowCollector.onCompletion> - VALUE_PARAMETER name:it index:0 type:@[ParameterName(name = 'cause')] kotlin.Throwable? + VALUE_PARAMETER name:it index:0 type:@[ParameterName(name = "cause")] kotlin.Throwable? BLOCK_BODY CALL 'public abstract fun invoke (p1: P1 of kotlin.coroutines.SuspendFunction1): R of kotlin.coroutines.SuspendFunction1 declared in kotlin.coroutines.SuspendFunction1' type=kotlin.Unit origin=null - $this: GET_VAR 'action: kotlin.coroutines.SuspendFunction1<@[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit> declared in .onCompletion' type=kotlin.coroutines.SuspendFunction1<@[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit> origin=VARIABLE_AS_FUNCTION - p1: GET_VAR 'it: @[ParameterName(name = 'cause')] kotlin.Throwable? declared in .onCompletion.' type=@[ParameterName(name = 'cause')] kotlin.Throwable? origin=null + $this: GET_VAR 'action: kotlin.coroutines.SuspendFunction1<@[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit> declared in .onCompletion' type=kotlin.coroutines.SuspendFunction1<@[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit> origin=VARIABLE_AS_FUNCTION + p1: GET_VAR 'it: @[ParameterName(name = "cause")] kotlin.Throwable? declared in .onCompletion.' type=@[ParameterName(name = "cause")] kotlin.Throwable? origin=null FUN name:asFairChannel visibility:private modality:FINAL <> ($receiver:.CoroutineScope, flow:.Flow<*>) returnType:.ReceiveChannel $receiver: VALUE_PARAMETER name: type:.CoroutineScope VALUE_PARAMETER name:flow index:0 type:.Flow<*> @@ -92,28 +92,28 @@ FILE fqName: fileName:/castsInsideCoroutineInference.kt TYPE_OP type=.ChannelCoroutine origin=CAST typeOperand=.ChannelCoroutine CALL 'public abstract fun (): .SendChannel.ProducerScope> declared in .ProducerScope' type=.SendChannel origin=GET_PROPERTY $this: GET_VAR '$this$produce: .ProducerScope declared in .asFairChannel.' type=.ProducerScope origin=null - CALL 'public final fun collect (action: kotlin.coroutines.SuspendFunction1<@[ParameterName(name = 'value')] T of .collect, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null + CALL 'public final fun collect (action: kotlin.coroutines.SuspendFunction1<@[ParameterName(name = "value")] T of .collect, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null : kotlin.Any? $receiver: GET_VAR 'flow: .Flow<*> declared in .asFairChannel' type=.Flow<*> origin=null - action: FUN_EXPR type=kotlin.coroutines.SuspendFunction1<@[ParameterName(name = 'value')] kotlin.Any?, kotlin.Unit> origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (value:@[ParameterName(name = 'value')] kotlin.Any?) returnType:kotlin.Unit [suspend] - VALUE_PARAMETER name:value index:0 type:@[ParameterName(name = 'value')] kotlin.Any? + action: FUN_EXPR type=kotlin.coroutines.SuspendFunction1<@[ParameterName(name = "value")] kotlin.Any?, kotlin.Unit> origin=LAMBDA + FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (value:@[ParameterName(name = "value")] kotlin.Any?) returnType:kotlin.Unit [suspend] + VALUE_PARAMETER name:value index:0 type:@[ParameterName(name = "value")] kotlin.Any? BLOCK_BODY - RETURN type=kotlin.Nothing from='local final fun (value: @[ParameterName(name = 'value')] kotlin.Any?): kotlin.Unit declared in .asFairChannel.' + RETURN type=kotlin.Nothing from='local final fun (value: @[ParameterName(name = "value")] kotlin.Any?): kotlin.Unit declared in .asFairChannel.' CALL 'public final fun sendFair (element: E of .ChannelCoroutine): kotlin.Unit declared in .ChannelCoroutine' type=kotlin.Unit origin=null $this: GET_VAR 'val channel: .ChannelCoroutine declared in .asFairChannel.' type=.ChannelCoroutine origin=null - element: BLOCK type=@[ParameterName(name = 'value')] kotlin.Any origin=ELVIS - VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:@[ParameterName(name = 'value')] kotlin.Any? [val] - GET_VAR 'value: @[ParameterName(name = 'value')] kotlin.Any? declared in .asFairChannel..' type=@[ParameterName(name = 'value')] kotlin.Any? origin=null - WHEN type=@[ParameterName(name = 'value')] kotlin.Any origin=null + element: BLOCK type=@[ParameterName(name = "value")] kotlin.Any origin=ELVIS + VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:@[ParameterName(name = "value")] kotlin.Any? [val] + GET_VAR 'value: @[ParameterName(name = "value")] kotlin.Any? declared in .asFairChannel..' type=@[ParameterName(name = "value")] kotlin.Any? origin=null + WHEN type=@[ParameterName(name = "value")] kotlin.Any origin=null 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 'val tmp_0: @[ParameterName(name = 'value')] kotlin.Any? declared in .asFairChannel..' type=@[ParameterName(name = 'value')] kotlin.Any? origin=null + arg0: GET_VAR 'val tmp_0: @[ParameterName(name = "value")] kotlin.Any? declared in .asFairChannel..' type=@[ParameterName(name = "value")] kotlin.Any? origin=null arg1: CONST Null type=kotlin.Nothing? value=null then: CONSTRUCTOR_CALL 'public constructor () declared in kotlin.Any' type=kotlin.Any origin=null BRANCH if: CONST Boolean type=kotlin.Boolean value=true - then: GET_VAR 'val tmp_0: @[ParameterName(name = 'value')] kotlin.Any? declared in .asFairChannel..' type=@[ParameterName(name = 'value')] kotlin.Any? origin=null + then: GET_VAR 'val tmp_0: @[ParameterName(name = "value")] kotlin.Any? declared in .asFairChannel..' type=@[ParameterName(name = "value")] kotlin.Any? origin=null FUN name:asChannel visibility:private modality:FINAL <> ($receiver:.CoroutineScope, flow:.Flow<*>) returnType:.ReceiveChannel $receiver: VALUE_PARAMETER name: type:.CoroutineScope VALUE_PARAMETER name:flow index:0 type:.Flow<*> @@ -126,29 +126,29 @@ FILE fqName: fileName:/castsInsideCoroutineInference.kt FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> ($receiver:.ProducerScope) returnType:kotlin.Unit [suspend] $receiver: VALUE_PARAMETER name:$this$produce type:.ProducerScope BLOCK_BODY - CALL 'public final fun collect (action: kotlin.coroutines.SuspendFunction1<@[ParameterName(name = 'value')] T of .collect, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null + CALL 'public final fun collect (action: kotlin.coroutines.SuspendFunction1<@[ParameterName(name = "value")] T of .collect, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null : kotlin.Any? $receiver: GET_VAR 'flow: .Flow<*> declared in .asChannel' type=.Flow<*> origin=null - action: FUN_EXPR type=kotlin.coroutines.SuspendFunction1<@[ParameterName(name = 'value')] kotlin.Any?, kotlin.Unit> origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (value:@[ParameterName(name = 'value')] kotlin.Any?) returnType:kotlin.Unit [suspend] - VALUE_PARAMETER name:value index:0 type:@[ParameterName(name = 'value')] kotlin.Any? + action: FUN_EXPR type=kotlin.coroutines.SuspendFunction1<@[ParameterName(name = "value")] kotlin.Any?, kotlin.Unit> origin=LAMBDA + FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (value:@[ParameterName(name = "value")] kotlin.Any?) returnType:kotlin.Unit [suspend] + VALUE_PARAMETER name:value index:0 type:@[ParameterName(name = "value")] kotlin.Any? BLOCK_BODY - RETURN type=kotlin.Nothing from='local final fun (value: @[ParameterName(name = 'value')] kotlin.Any?): kotlin.Unit declared in .asChannel.' + RETURN type=kotlin.Nothing from='local final fun (value: @[ParameterName(name = "value")] kotlin.Any?): kotlin.Unit declared in .asChannel.' CALL 'public abstract fun send (e: E of .SendChannel): kotlin.Unit declared in .SendChannel' type=kotlin.Unit origin=null $this: CALL 'public abstract fun (): .SendChannel.ProducerScope> declared in .ProducerScope' type=.SendChannel origin=GET_PROPERTY $this: GET_VAR '$this$produce: .ProducerScope declared in .asChannel.' type=.ProducerScope origin=null - e: BLOCK type=@[ParameterName(name = 'value')] kotlin.Any origin=ELVIS - VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:@[ParameterName(name = 'value')] kotlin.Any? [val] - GET_VAR 'value: @[ParameterName(name = 'value')] kotlin.Any? declared in .asChannel..' type=@[ParameterName(name = 'value')] kotlin.Any? origin=null - WHEN type=@[ParameterName(name = 'value')] kotlin.Any origin=null + e: BLOCK type=@[ParameterName(name = "value")] kotlin.Any origin=ELVIS + VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:@[ParameterName(name = "value")] kotlin.Any? [val] + GET_VAR 'value: @[ParameterName(name = "value")] kotlin.Any? declared in .asChannel..' type=@[ParameterName(name = "value")] kotlin.Any? origin=null + WHEN type=@[ParameterName(name = "value")] kotlin.Any origin=null 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 'val tmp_1: @[ParameterName(name = 'value')] kotlin.Any? declared in .asChannel..' type=@[ParameterName(name = 'value')] kotlin.Any? origin=null + arg0: GET_VAR 'val tmp_1: @[ParameterName(name = "value")] kotlin.Any? declared in .asChannel..' type=@[ParameterName(name = "value")] kotlin.Any? origin=null arg1: CONST Null type=kotlin.Nothing? value=null then: CONSTRUCTOR_CALL 'public constructor () declared in kotlin.Any' type=kotlin.Any origin=null BRANCH if: CONST Boolean type=kotlin.Boolean value=true - then: GET_VAR 'val tmp_1: @[ParameterName(name = 'value')] kotlin.Any? declared in .asChannel..' type=@[ParameterName(name = 'value')] kotlin.Any? origin=null + then: GET_VAR 'val tmp_1: @[ParameterName(name = "value")] kotlin.Any? declared in .asChannel..' type=@[ParameterName(name = "value")] kotlin.Any? origin=null CLASS CLASS name:SafeCollector modality:FINAL visibility:public superTypes:[.FlowCollector.SafeCollector>] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.SafeCollector.SafeCollector> TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false @@ -203,10 +203,10 @@ FILE fqName: fileName:/castsInsideCoroutineInference.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun flowScope (block: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<.CoroutineScope, R of .flowScope>): R of .flowScope declared in ' CALL 'public final fun TODO (): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null - FUN name:collect visibility:public modality:FINAL ($receiver:.Flow.collect>, action:kotlin.coroutines.SuspendFunction1<@[ParameterName(name = 'value')] T of .collect, kotlin.Unit>) returnType:kotlin.Unit [inline,suspend] + FUN name:collect visibility:public modality:FINAL ($receiver:.Flow.collect>, action:kotlin.coroutines.SuspendFunction1<@[ParameterName(name = "value")] T of .collect, kotlin.Unit>) returnType:kotlin.Unit [inline,suspend] TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false $receiver: VALUE_PARAMETER name: type:.Flow.collect> - VALUE_PARAMETER name:action index:0 type:kotlin.coroutines.SuspendFunction1<@[ParameterName(name = 'value')] T of .collect, kotlin.Unit> [crossinline] + VALUE_PARAMETER name:action index:0 type:kotlin.coroutines.SuspendFunction1<@[ParameterName(name = "value")] T of .collect, kotlin.Unit> [crossinline] BLOCK_BODY CLASS CLASS name:ChannelCoroutine modality:OPEN visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.ChannelCoroutine.ChannelCoroutine> diff --git a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.ir.txt b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.ir.txt index f648ef58e3b..e46ede4e6d6 100644 --- a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.ir.txt +++ b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.ir.txt @@ -24,12 +24,12 @@ FILE fqName: fileName:/castsInsideCoroutineInference.kt $this: GET_VAR 'block: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.CoroutineScope, .FlowCollector.scopedFlow>, kotlin.Unit> declared in .scopedFlow' type=@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.CoroutineScope, .FlowCollector.scopedFlow>, kotlin.Unit> origin=VARIABLE_AS_FUNCTION p1: GET_VAR '$this$flowScope: .CoroutineScope declared in .scopedFlow..' type=.CoroutineScope origin=null p2: GET_VAR 'val collector: .FlowCollector.scopedFlow> declared in .scopedFlow.' type=.FlowCollector.scopedFlow> origin=null - FUN name:onCompletion visibility:public modality:FINAL ($receiver:.Flow.onCompletion>, action:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit>) returnType:.Flow.onCompletion> + FUN name:onCompletion visibility:public modality:FINAL ($receiver:.Flow.onCompletion>, action:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit>) returnType:.Flow.onCompletion> TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false $receiver: VALUE_PARAMETER name: type:.Flow.onCompletion> - VALUE_PARAMETER name:action index:0 type:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit> + VALUE_PARAMETER name:action index:0 type:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit> BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun onCompletion (action: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit>): .Flow.onCompletion> declared in ' + RETURN type=kotlin.Nothing from='public final fun onCompletion (action: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit>): .Flow.onCompletion> declared in ' CALL 'public final fun unsafeFlow (block: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<.FlowCollector.unsafeFlow>, kotlin.Unit>): .Flow.unsafeFlow> declared in ' type=.Flow.onCompletion> origin=null : T of .onCompletion block: FUN_EXPR type=@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<.FlowCollector.onCompletion>, kotlin.Unit> origin=LAMBDA @@ -40,14 +40,14 @@ FILE fqName: fileName:/castsInsideCoroutineInference.kt CONSTRUCTOR_CALL 'public constructor (collector: .FlowCollector.SafeCollector>) declared in .SafeCollector' type=.SafeCollector.onCompletion> origin=null : T of .onCompletion collector: GET_VAR '$this$unsafeFlow: .FlowCollector.onCompletion> declared in .onCompletion.' type=.FlowCollector.onCompletion> origin=null - CALL 'public final fun invokeSafely (action: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.invokeSafely>, @[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null + CALL 'public final fun invokeSafely (action: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.invokeSafely>, @[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null : T of .onCompletion $receiver: GET_VAR 'val safeCollector: .SafeCollector.onCompletion> declared in .onCompletion.' type=.SafeCollector.onCompletion> origin=null - action: GET_VAR 'action: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit> declared in .onCompletion' type=@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit> origin=null - FUN name:invokeSafely visibility:public modality:FINAL ($receiver:.FlowCollector.invokeSafely>, action:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.invokeSafely>, @[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit>) returnType:kotlin.Unit [suspend] + action: GET_VAR 'action: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit> declared in .onCompletion' type=@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit> origin=null + FUN name:invokeSafely visibility:public modality:FINAL ($receiver:.FlowCollector.invokeSafely>, action:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.invokeSafely>, @[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit>) returnType:kotlin.Unit [suspend] TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false $receiver: VALUE_PARAMETER name: type:.FlowCollector.invokeSafely> - VALUE_PARAMETER name:action index:0 type:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.invokeSafely>, @[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit> + VALUE_PARAMETER name:action index:0 type:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.invokeSafely>, @[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit> BLOCK_BODY FUN name:unsafeFlow visibility:public modality:FINAL (block:@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<.FlowCollector.unsafeFlow>, kotlin.Unit>) returnType:.Flow.unsafeFlow> [inline] annotations: @@ -57,24 +57,24 @@ FILE fqName: fileName:/castsInsideCoroutineInference.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun unsafeFlow (block: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<.FlowCollector.unsafeFlow>, kotlin.Unit>): .Flow.unsafeFlow> declared in ' CALL 'public final fun TODO (): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null - FUN name:onCompletion visibility:public modality:FINAL ($receiver:.Flow.onCompletion>, action:kotlin.coroutines.SuspendFunction1<@[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit>) returnType:.Flow.onCompletion> + FUN name:onCompletion visibility:public modality:FINAL ($receiver:.Flow.onCompletion>, action:kotlin.coroutines.SuspendFunction1<@[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit>) returnType:.Flow.onCompletion> annotations: - Deprecated(message = 'binary compatibility with a version w/o FlowCollector receiver', replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) + Deprecated(message = "binary compatibility with a version w/o FlowCollector receiver", replaceWith = , level = GET_ENUM 'ENUM_ENTRY IR_EXTERNAL_DECLARATION_STUB name:HIDDEN' type=kotlin.DeprecationLevel) TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false $receiver: VALUE_PARAMETER name: type:.Flow.onCompletion> - VALUE_PARAMETER name:action index:0 type:kotlin.coroutines.SuspendFunction1<@[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit> + VALUE_PARAMETER name:action index:0 type:kotlin.coroutines.SuspendFunction1<@[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit> BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun onCompletion (action: kotlin.coroutines.SuspendFunction1<@[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit>): .Flow.onCompletion> declared in ' - CALL 'public final fun onCompletion (action: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit>): .Flow.onCompletion> declared in ' type=.Flow.onCompletion> origin=null + RETURN type=kotlin.Nothing from='public final fun onCompletion (action: kotlin.coroutines.SuspendFunction1<@[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit>): .Flow.onCompletion> declared in ' + CALL 'public final fun onCompletion (action: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit>): .Flow.onCompletion> declared in ' type=.Flow.onCompletion> origin=null : T of .onCompletion $receiver: GET_VAR ': .Flow.onCompletion> declared in .onCompletion' type=.Flow.onCompletion> origin=null - action: FUN_EXPR type=@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit> origin=LAMBDA + action: FUN_EXPR type=@[ExtensionFunctionType] kotlin.coroutines.SuspendFunction2<.FlowCollector.onCompletion>, @[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> ($receiver:.FlowCollector.onCompletion>, it:kotlin.Throwable?) returnType:kotlin.Unit [suspend] $receiver: VALUE_PARAMETER name:$this$onCompletion type:.FlowCollector.onCompletion> VALUE_PARAMETER name:it index:0 type:kotlin.Throwable? BLOCK_BODY CALL 'public abstract fun invoke (p1: P1 of kotlin.coroutines.SuspendFunction1): R of kotlin.coroutines.SuspendFunction1 declared in kotlin.coroutines.SuspendFunction1' type=kotlin.Unit origin=INVOKE - $this: GET_VAR 'action: kotlin.coroutines.SuspendFunction1<@[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit> declared in .onCompletion' type=kotlin.coroutines.SuspendFunction1<@[ParameterName(name = 'cause')] kotlin.Throwable?, kotlin.Unit> origin=VARIABLE_AS_FUNCTION + $this: GET_VAR 'action: kotlin.coroutines.SuspendFunction1<@[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit> declared in .onCompletion' type=kotlin.coroutines.SuspendFunction1<@[ParameterName(name = "cause")] kotlin.Throwable?, kotlin.Unit> origin=VARIABLE_AS_FUNCTION p1: GET_VAR 'it: kotlin.Throwable? declared in .onCompletion.' type=kotlin.Throwable? origin=null FUN name:asFairChannel visibility:private modality:FINAL <> ($receiver:.CoroutineScope, flow:.Flow<*>) returnType:.ReceiveChannel $receiver: VALUE_PARAMETER name: type:.CoroutineScope @@ -92,10 +92,10 @@ FILE fqName: fileName:/castsInsideCoroutineInference.kt TYPE_OP type=.ChannelCoroutine origin=CAST typeOperand=.ChannelCoroutine CALL 'public abstract fun (): .SendChannel.ProducerScope> declared in .ProducerScope' type=.SendChannel origin=GET_PROPERTY $this: GET_VAR '$this$produce: .ProducerScope declared in .asFairChannel.' type=.ProducerScope origin=null - CALL 'public final fun collect (action: kotlin.coroutines.SuspendFunction1<@[ParameterName(name = 'value')] T of .collect, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null + CALL 'public final fun collect (action: kotlin.coroutines.SuspendFunction1<@[ParameterName(name = "value")] T of .collect, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null : kotlin.Any? $receiver: GET_VAR 'flow: .Flow<*> declared in .asFairChannel' type=.Flow<*> origin=null - action: FUN_EXPR type=kotlin.coroutines.SuspendFunction1<@[ParameterName(name = 'value')] kotlin.Any?, kotlin.Unit> origin=LAMBDA + action: FUN_EXPR type=kotlin.coroutines.SuspendFunction1<@[ParameterName(name = "value")] kotlin.Any?, kotlin.Unit> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (value:kotlin.Any?) returnType:kotlin.Unit [suspend] VALUE_PARAMETER name:value index:0 type:kotlin.Any? BLOCK_BODY @@ -126,10 +126,10 @@ FILE fqName: fileName:/castsInsideCoroutineInference.kt FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> ($receiver:.ProducerScope) returnType:kotlin.Unit [suspend] $receiver: VALUE_PARAMETER name:$this$produce type:.ProducerScope BLOCK_BODY - CALL 'public final fun collect (action: kotlin.coroutines.SuspendFunction1<@[ParameterName(name = 'value')] T of .collect, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null + CALL 'public final fun collect (action: kotlin.coroutines.SuspendFunction1<@[ParameterName(name = "value")] T of .collect, kotlin.Unit>): kotlin.Unit declared in ' type=kotlin.Unit origin=null : kotlin.Any? $receiver: GET_VAR 'flow: .Flow<*> declared in .asChannel' type=.Flow<*> origin=null - action: FUN_EXPR type=kotlin.coroutines.SuspendFunction1<@[ParameterName(name = 'value')] kotlin.Any?, kotlin.Unit> origin=LAMBDA + action: FUN_EXPR type=kotlin.coroutines.SuspendFunction1<@[ParameterName(name = "value")] kotlin.Any?, kotlin.Unit> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (value:kotlin.Any?) returnType:kotlin.Unit [suspend] VALUE_PARAMETER name:value index:0 type:kotlin.Any? BLOCK_BODY @@ -203,10 +203,10 @@ FILE fqName: fileName:/castsInsideCoroutineInference.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun flowScope (block: @[ExtensionFunctionType] kotlin.coroutines.SuspendFunction1<.CoroutineScope, R of .flowScope>): R of .flowScope declared in ' CALL 'public final fun TODO (): kotlin.Nothing declared in kotlin' type=kotlin.Nothing origin=null - FUN name:collect visibility:public modality:FINAL ($receiver:.Flow.collect>, action:kotlin.coroutines.SuspendFunction1<@[ParameterName(name = 'value')] T of .collect, kotlin.Unit>) returnType:kotlin.Unit [inline,suspend] + FUN name:collect visibility:public modality:FINAL ($receiver:.Flow.collect>, action:kotlin.coroutines.SuspendFunction1<@[ParameterName(name = "value")] T of .collect, kotlin.Unit>) returnType:kotlin.Unit [inline,suspend] TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false $receiver: VALUE_PARAMETER name: type:.Flow.collect> - VALUE_PARAMETER name:action index:0 type:kotlin.coroutines.SuspendFunction1<@[ParameterName(name = 'value')] T of .collect, kotlin.Unit> [crossinline] + VALUE_PARAMETER name:action index:0 type:kotlin.coroutines.SuspendFunction1<@[ParameterName(name = "value")] T of .collect, kotlin.Unit> [crossinline] BLOCK_BODY CLASS CLASS name:ChannelCoroutine modality:OPEN visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.ChannelCoroutine.ChannelCoroutine> diff --git a/compiler/testData/ir/irText/types/definitelyNonNullSAM.ir.txt b/compiler/testData/ir/irText/types/definitelyNonNullSAM.ir.txt index 8c086da4c51..0fe2d2297e7 100644 --- a/compiler/testData/ir/irText/types/definitelyNonNullSAM.ir.txt +++ b/compiler/testData/ir/irText/types/definitelyNonNullSAM.ir.txt @@ -30,7 +30,7 @@ FILE fqName: fileName:/definitelyNonNullSAM.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun foo (): .FIn<{S of .Test & Any}> declared in .Test' TYPE_OP type=.FIn<{S of .Test & Any}> origin=SAM_CONVERSION typeOperand=.FIn<{S of .Test & Any}> - FUN_EXPR type=kotlin.Function1<@[ParameterName(name = 'x')] {S of .Test & Any}, kotlin.Unit> origin=LAMBDA + FUN_EXPR type=kotlin.Function1<@[ParameterName(name = "x")] {S of .Test & Any}, kotlin.Unit> origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (sx:{S of .Test & Any}) returnType:kotlin.Unit VALUE_PARAMETER name:sx index:0 type:{S of .Test & Any} BLOCK_BODY diff --git a/compiler/testData/ir/sourceRanges/declarations/delegatedProperties.fir.txt b/compiler/testData/ir/sourceRanges/declarations/delegatedProperties.fir.txt index ba0208f9353..95f9a00fd78 100644 --- a/compiler/testData/ir/sourceRanges/declarations/delegatedProperties.fir.txt +++ b/compiler/testData/ir/sourceRanges/declarations/delegatedProperties.fir.txt @@ -25,21 +25,21 @@ @10:4..12:5 PROPERTY name:observableProp visibility:public modality:FINAL [delegated,var] @10:34..12:5 FIELD PROPERTY_DELEGATE name:observableProp$delegate type:kotlin.properties.ReadWriteProperty visibility:private [final] @10:44..12:5 EXPRESSION_BODY - @10:44..12:5 CALL 'public final fun observable (initialValue: T of kotlin.properties.Delegates.observable, onChange: kotlin.Function3<@[ParameterName(name = 'property')] kotlin.reflect.KProperty<*>, @[ParameterName(name = 'oldValue')] T of kotlin.properties.Delegates.observable, @[ParameterName(name = 'newValue')] T of kotlin.properties.Delegates.observable, kotlin.Unit>): kotlin.properties.ReadWriteProperty [inline] declared in kotlin.properties.Delegates' type=kotlin.properties.ReadWriteProperty origin=null + @10:44..12:5 CALL 'public final fun observable (initialValue: T of kotlin.properties.Delegates.observable, onChange: kotlin.Function3<@[ParameterName(name = "property")] kotlin.reflect.KProperty<*>, @[ParameterName(name = "oldValue")] T of kotlin.properties.Delegates.observable, @[ParameterName(name = "newValue")] T of kotlin.properties.Delegates.observable, kotlin.Unit>): kotlin.properties.ReadWriteProperty [inline] declared in kotlin.properties.Delegates' type=kotlin.properties.ReadWriteProperty origin=null @10:34..43 GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Delegates modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.properties.Delegates @10:55..63 CONST String type=kotlin.String value="" - @10:65..12:5 FUN_EXPR type=kotlin.Function3<@[ParameterName(name = 'property')] kotlin.reflect.KProperty<*>, @[ParameterName(name = 'oldValue')] kotlin.String, @[ParameterName(name = 'newValue')] kotlin.String, kotlin.Unit> origin=LAMBDA - @10:65..12:5 FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (prop:@[ParameterName(name = 'property')] kotlin.reflect.KProperty<*>, old:@[ParameterName(name = 'oldValue')] kotlin.String, new:@[ParameterName(name = 'newValue')] kotlin.String) returnType:kotlin.Unit - @10:67..71 VALUE_PARAMETER name:prop index:0 type:@[ParameterName(name = 'property')] kotlin.reflect.KProperty<*> - @10:73..76 VALUE_PARAMETER name:old index:1 type:@[ParameterName(name = 'oldValue')] kotlin.String - @10:78..81 VALUE_PARAMETER name:new index:2 type:@[ParameterName(name = 'newValue')] kotlin.String + @10:65..12:5 FUN_EXPR type=kotlin.Function3<@[ParameterName(name = "property")] kotlin.reflect.KProperty<*>, @[ParameterName(name = "oldValue")] kotlin.String, @[ParameterName(name = "newValue")] kotlin.String, kotlin.Unit> origin=LAMBDA + @10:65..12:5 FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (prop:@[ParameterName(name = "property")] kotlin.reflect.KProperty<*>, old:@[ParameterName(name = "oldValue")] kotlin.String, new:@[ParameterName(name = "newValue")] kotlin.String) returnType:kotlin.Unit + @10:67..71 VALUE_PARAMETER name:prop index:0 type:@[ParameterName(name = "property")] kotlin.reflect.KProperty<*> + @10:73..76 VALUE_PARAMETER name:old index:1 type:@[ParameterName(name = "oldValue")] kotlin.String + @10:78..81 VALUE_PARAMETER name:new index:2 type:@[ParameterName(name = "newValue")] kotlin.String @11:8..37 BLOCK_BODY @11:8..37 CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null @11:16..36 STRING_CONCATENATION type=kotlin.String @11:17..21 CONST String type=kotlin.String value="Was " - @11:22..25 GET_VAR 'old: @[ParameterName(name = 'oldValue')] kotlin.String declared in .MyClass.observableProp$delegate.' type=@[ParameterName(name = 'oldValue')] kotlin.String origin=null + @11:22..25 GET_VAR 'old: @[ParameterName(name = "oldValue")] kotlin.String declared in .MyClass.observableProp$delegate.' type=@[ParameterName(name = "oldValue")] kotlin.String origin=null @11:25..31 CONST String type=kotlin.String value=", now " - @11:32..35 GET_VAR 'new: @[ParameterName(name = 'newValue')] kotlin.String declared in .MyClass.observableProp$delegate.' type=@[ParameterName(name = 'newValue')] kotlin.String origin=null + @11:32..35 GET_VAR 'new: @[ParameterName(name = "newValue")] kotlin.String declared in .MyClass.observableProp$delegate.' type=@[ParameterName(name = "newValue")] kotlin.String origin=null @10:34..12:5 FUN DELEGATED_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.MyClass) returnType:kotlin.String @10:34..12:5 VALUE_PARAMETER name: type:.MyClass @10:34..12:5 BLOCK_BODY diff --git a/compiler/testData/ir/sourceRanges/declarations/delegatedProperties.txt b/compiler/testData/ir/sourceRanges/declarations/delegatedProperties.txt index 89428f36896..282678a034a 100644 --- a/compiler/testData/ir/sourceRanges/declarations/delegatedProperties.txt +++ b/compiler/testData/ir/sourceRanges/declarations/delegatedProperties.txt @@ -25,10 +25,10 @@ @10:4..12:5 PROPERTY name:observableProp visibility:public modality:FINAL [delegated,var] @10:31..12:5 FIELD PROPERTY_DELEGATE name:observableProp$delegate type:kotlin.properties.ReadWriteProperty visibility:private [final] @10:44..12:5 EXPRESSION_BODY - @10:44..12:5 CALL 'public final fun observable (initialValue: T of kotlin.properties.Delegates.observable, onChange: kotlin.Function3<@[ParameterName(name = 'property')] kotlin.reflect.KProperty<*>, @[ParameterName(name = 'oldValue')] T of kotlin.properties.Delegates.observable, @[ParameterName(name = 'newValue')] T of kotlin.properties.Delegates.observable, kotlin.Unit>): kotlin.properties.ReadWriteProperty [inline] declared in kotlin.properties.Delegates' type=kotlin.properties.ReadWriteProperty origin=null + @10:44..12:5 CALL 'public final fun observable (initialValue: T of kotlin.properties.Delegates.observable, onChange: kotlin.Function3<@[ParameterName(name = "property")] kotlin.reflect.KProperty<*>, @[ParameterName(name = "oldValue")] T of kotlin.properties.Delegates.observable, @[ParameterName(name = "newValue")] T of kotlin.properties.Delegates.observable, kotlin.Unit>): kotlin.properties.ReadWriteProperty [inline] declared in kotlin.properties.Delegates' type=kotlin.properties.ReadWriteProperty origin=null @10:34..43 GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Delegates modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.properties.Delegates @10:56..62 CONST String type=kotlin.String value="" - @10:65..12:5 FUN_EXPR type=kotlin.Function3<@[ParameterName(name = 'property')] kotlin.reflect.KProperty<*>, @[ParameterName(name = 'oldValue')] kotlin.String, @[ParameterName(name = 'newValue')] kotlin.String, kotlin.Unit> origin=LAMBDA + @10:65..12:5 FUN_EXPR type=kotlin.Function3<@[ParameterName(name = "property")] kotlin.reflect.KProperty<*>, @[ParameterName(name = "oldValue")] kotlin.String, @[ParameterName(name = "newValue")] kotlin.String, kotlin.Unit> origin=LAMBDA @10:65..12:5 FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> (prop:kotlin.reflect.KProperty<*>, old:kotlin.String, new:kotlin.String) returnType:kotlin.Unit @10:67..71 VALUE_PARAMETER name:prop index:0 type:kotlin.reflect.KProperty<*> @10:73..76 VALUE_PARAMETER name:old index:1 type:kotlin.String