diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DumpIrTree.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DumpIrTree.kt index 40bdce5fca5..3e803c97531 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DumpIrTree.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/DumpIrTree.kt @@ -61,6 +61,7 @@ data class DumpIrTreeOptions( val printFacadeClassInFqNames: Boolean = true, val printFlagsInDeclarationReferences: Boolean = true, val printSignatures: Boolean = false, + val printTypeAbbreviations: Boolean = true, ) private fun IrFile.shouldSkipDump(): Boolean { 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 0117775909a..d8ed55096ce 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 @@ -783,9 +783,10 @@ private fun IrType.renderTypeInner(renderer: RenderIrElementVisitor?, options: D } else if (isMarkedNullable()) { append('?') } - abbreviation?.let { - append(it.renderTypeAbbreviation(renderer, options)) - } + if (options.printTypeAbbreviations) + abbreviation?.let { + append(it.renderTypeAbbreviation(renderer, options)) + } } else -> "{${javaClass.simpleName} $this}" diff --git a/compiler/testData/codegen/box/fir/noSymbolForIntRangeIterator.ir.txt b/compiler/testData/codegen/box/fir/noSymbolForIntRangeIterator.ir.txt index 0d5f21caff1..694cc69d1d6 100644 --- a/compiler/testData/codegen/box/fir/noSymbolForIntRangeIterator.ir.txt +++ b/compiler/testData/codegen/box/fir/noSymbolForIntRangeIterator.ir.txt @@ -67,10 +67,10 @@ FILE fqName: fileName:/noSymbolForIntRangeIterator.kt $this: GET_VAR 'val tmp_1: kotlin.collections.IntIterator declared in .test.localFunc' type=kotlin.collections.IntIterator origin=null BLOCK type=kotlin.Unit origin=null VAR name:s type:kotlin.String [val] - CALL 'public final fun buildString (builderAction: @[ExtensionFunctionType] kotlin.Function1): kotlin.String declared in kotlin.text' type=kotlin.String origin=null - builderAction: FUN_EXPR type=@[ExtensionFunctionType] kotlin.Function1 origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> ($receiver:java.lang.StringBuilder{ kotlin.text.StringBuilder }) returnType:kotlin.Unit - $receiver: VALUE_PARAMETER name:$this$buildString type:java.lang.StringBuilder{ kotlin.text.StringBuilder } + CALL 'public final fun buildString (builderAction: @[ExtensionFunctionType] kotlin.Function1): kotlin.String declared in kotlin.text' type=kotlin.String origin=null + builderAction: FUN_EXPR type=@[ExtensionFunctionType] kotlin.Function1 origin=LAMBDA + FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> ($receiver:java.lang.StringBuilder) returnType:kotlin.Unit + $receiver: VALUE_PARAMETER name:$this$buildString type:java.lang.StringBuilder BLOCK_BODY BLOCK type=kotlin.Unit origin=FOR_LOOP VAR FOR_LOOP_ITERATOR name:tmp_2 type:kotlin.collections.IntIterator [val] @@ -87,8 +87,8 @@ FILE fqName: fileName:/noSymbolForIntRangeIterator.kt $this: GET_VAR 'val tmp_2: kotlin.collections.IntIterator declared in .test.localFunc.' type=kotlin.collections.IntIterator origin=null BLOCK type=kotlin.Unit origin=null TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - CALL 'public final fun appendLine (value: kotlin.String?): java.lang.StringBuilder{ kotlin.text.StringBuilder } declared in kotlin.text' type=java.lang.StringBuilder{ kotlin.text.StringBuilder } origin=null - $receiver: GET_VAR '$this$buildString: java.lang.StringBuilder{ kotlin.text.StringBuilder } declared in .test.localFunc.' type=java.lang.StringBuilder{ kotlin.text.StringBuilder } origin=null + CALL 'public final fun appendLine (value: kotlin.String?): java.lang.StringBuilder declared in kotlin.text' type=java.lang.StringBuilder origin=null + $receiver: GET_VAR '$this$buildString: java.lang.StringBuilder declared in .test.localFunc.' type=java.lang.StringBuilder origin=null value: STRING_CONCATENATION type=kotlin.String CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=MUL $this: GET_VAR 'val i: kotlin.Int declared in .test.localFunc' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.ir.txt b/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.ir.txt index 0e34e4b5c2b..07e4fcdfd3a 100644 --- a/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.ir.txt +++ b/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.ir.txt @@ -34,14 +34,14 @@ FILE fqName: fileName:/delegatingConstructorCallToTypeAliasConstructor.kt TYPEALIAS name:CT visibility:public expandedType:.Cell.CT> TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false TYPEALIAS name:CStr visibility:public expandedType:.Cell - CLASS CLASS name:C1 modality:FINAL visibility:public superTypes:[.Cell{ .CT }] + CLASS CLASS name:C1 modality:FINAL visibility:public superTypes:[.Cell] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.C1 CONSTRUCTOR visibility:public <> () returnType:.C1 [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'public constructor (value: T of .Cell) declared in .Cell' : kotlin.String value: CONST String type=kotlin.String value="O" - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C1 modality:FINAL visibility:public superTypes:[.Cell{ .CT }]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C1 modality:FINAL visibility:public superTypes:[.Cell]' PROPERTY FAKE_OVERRIDE name:value visibility:public modality:FINAL [fake_override,val] overridden: public final value: T of .Cell @@ -63,14 +63,14 @@ FILE fqName: fileName:/delegatingConstructorCallToTypeAliasConstructor.kt overridden: public open fun toString (): kotlin.String declared in .Cell $this: VALUE_PARAMETER name: type:kotlin.Any - CLASS CLASS name:C2 modality:FINAL visibility:public superTypes:[.Cell{ .CStr }] + CLASS CLASS name:C2 modality:FINAL visibility:public superTypes:[.Cell] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.C2 CONSTRUCTOR visibility:public <> () returnType:.C2 [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'public constructor (value: T of .Cell) declared in .Cell' : kotlin.String value: CONST String type=kotlin.String value="K" - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C2 modality:FINAL visibility:public superTypes:[.Cell{ .CStr }]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C2 modality:FINAL visibility:public superTypes:[.Cell]' PROPERTY FAKE_OVERRIDE name:value visibility:public modality:FINAL [fake_override,val] overridden: public final value: T of .Cell diff --git a/compiler/testData/ir/irText/declarations/classLevelProperties.ir.txt b/compiler/testData/ir/irText/declarations/classLevelProperties.ir.txt index 6fcbce7ab05..a7203987831 100644 --- a/compiler/testData/ir/irText/declarations/classLevelProperties.ir.txt +++ b/compiler/testData/ir/irText/declarations/classLevelProperties.ir.txt @@ -113,9 +113,9 @@ FILE fqName: fileName:/classLevelProperties.kt thisRef: GET_VAR ': .C declared in .C.' type=.C origin=null property: PROPERTY_REFERENCE 'public final test7: kotlin.Int' field=null getter='public final fun (): kotlin.Int declared in .C' setter=null type=kotlin.reflect.KProperty1<.C, kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE PROPERTY name:test8 visibility:public modality:FINAL [delegated,var] - FIELD PROPERTY_DELEGATE name:test8$delegate type:java.util.HashMap{ kotlin.collections.HashMap } visibility:private [final] + FIELD PROPERTY_DELEGATE name:test8$delegate type:java.util.HashMap visibility:private [final] EXPRESSION_BODY - CALL 'public final fun hashMapOf (): java.util.HashMap{ kotlin.collections.HashMap } declared in kotlin.collections' type=java.util.HashMap{ kotlin.collections.HashMap } origin=null + CALL 'public final fun hashMapOf (): java.util.HashMap declared in kotlin.collections' type=java.util.HashMap origin=null : kotlin.String : kotlin.Int FUN DELEGATED_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int @@ -126,7 +126,7 @@ FILE fqName: fileName:/classLevelProperties.kt CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V1 of kotlin.collections.getValue declared in kotlin.collections' type=kotlin.Int origin=null : kotlin.Int : kotlin.Int - $receiver: GET_FIELD 'FIELD PROPERTY_DELEGATE name:test8$delegate type:java.util.HashMap{ kotlin.collections.HashMap } visibility:private [final]' type=java.util.HashMap{ kotlin.collections.HashMap } origin=null + $receiver: GET_FIELD 'FIELD PROPERTY_DELEGATE name:test8$delegate type:java.util.HashMap visibility:private [final]' type=java.util.HashMap origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null thisRef: GET_VAR ': .C declared in .C.' type=.C origin=null property: PROPERTY_REFERENCE 'public final test8: kotlin.Int' field=null getter='public final fun (): kotlin.Int declared in .C' setter='public final fun (: kotlin.Int): kotlin.Unit declared in .C' type=kotlin.reflect.KMutableProperty1<.C, kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE @@ -138,7 +138,7 @@ FILE fqName: fileName:/classLevelProperties.kt RETURN type=kotlin.Nothing from='public final fun (: kotlin.Int): kotlin.Unit declared in .C' CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.collections.setValue): kotlin.Unit declared in kotlin.collections' type=kotlin.Unit origin=null : kotlin.Int - $receiver: GET_FIELD 'FIELD PROPERTY_DELEGATE name:test8$delegate type:java.util.HashMap{ kotlin.collections.HashMap } visibility:private [final]' type=java.util.HashMap{ kotlin.collections.HashMap } origin=null + $receiver: GET_FIELD 'FIELD PROPERTY_DELEGATE name:test8$delegate type:java.util.HashMap visibility:private [final]' type=java.util.HashMap origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null thisRef: GET_VAR ': .C declared in .C.' type=.C origin=null property: PROPERTY_REFERENCE 'public final test8: kotlin.Int' field=null getter='public final fun (): kotlin.Int declared in .C' setter='public final fun (: kotlin.Int): kotlin.Unit declared in .C' type=kotlin.reflect.KMutableProperty1<.C, kotlin.Int> origin=PROPERTY_REFERENCE_FOR_DELEGATE diff --git a/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/compareTo.ir.txt b/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/compareTo.ir.txt index acbefb97a0b..02220ec3e51 100644 --- a/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/compareTo.ir.txt +++ b/compiler/testData/ir/irText/declarations/contextReceivers/fromKEEP/compareTo.ir.txt @@ -157,35 +157,35 @@ FILE fqName: fileName:/compareTo.kt CONST Boolean type=kotlin.Boolean value=false RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in .Pair' CONST Boolean type=kotlin.Boolean value=true - FUN name:compareTo visibility:public modality:FINAL ($receiver:T of .compareTo, $context_receiver_0:java.util.Comparator.compareTo>{ kotlin.Comparator.compareTo> }, other:T of .compareTo) returnType:kotlin.Int [operator,infix] + FUN name:compareTo visibility:public modality:FINAL ($receiver:T of .compareTo, $context_receiver_0:java.util.Comparator.compareTo>, other:T of .compareTo) returnType:kotlin.Int [operator,infix] TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false contextReceiverParametersCount: 1 $receiver: VALUE_PARAMETER name: type:T of .compareTo - VALUE_PARAMETER name:$context_receiver_0 index:0 type:java.util.Comparator.compareTo>{ kotlin.Comparator.compareTo> } + VALUE_PARAMETER name:$context_receiver_0 index:0 type:java.util.Comparator.compareTo> VALUE_PARAMETER name:other index:1 type:T of .compareTo BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun compareTo ($context_receiver_0: java.util.Comparator.compareTo>{ kotlin.Comparator.compareTo> }, other: T of .compareTo): kotlin.Int declared in ' + RETURN type=kotlin.Nothing from='public final fun compareTo ($context_receiver_0: java.util.Comparator.compareTo>, other: T of .compareTo): kotlin.Int declared in ' CALL 'public abstract fun compare (p0: @[FlexibleNullability] T of java.util.Comparator?, p1: @[FlexibleNullability] T of java.util.Comparator?): kotlin.Int declared in java.util.Comparator' type=kotlin.Int origin=null - $this: GET_VAR '$context_receiver_0: java.util.Comparator.compareTo>{ kotlin.Comparator.compareTo> } declared in .compareTo' type=java.util.Comparator.compareTo>{ kotlin.Comparator.compareTo> } origin=null + $this: GET_VAR '$context_receiver_0: java.util.Comparator.compareTo> declared in .compareTo' type=java.util.Comparator.compareTo> origin=null p0: GET_VAR ': T of .compareTo declared in .compareTo' type=T of .compareTo origin=null p1: GET_VAR 'other: T of .compareTo declared in .compareTo' type=T of .compareTo origin=null PROPERTY name:min visibility:public modality:FINAL [val] - FUN name: visibility:public modality:FINAL ($receiver:.Pair., T of .>, $context_receiver_0:java.util.Comparator.>{ kotlin.Comparator.> }) returnType:T of . + FUN name: visibility:public modality:FINAL ($receiver:.Pair., T of .>, $context_receiver_0:java.util.Comparator.>) returnType:T of . correspondingProperty: PROPERTY name:min visibility:public modality:FINAL [val] TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false contextReceiverParametersCount: 1 $receiver: VALUE_PARAMETER name: type:.Pair., T of .> - VALUE_PARAMETER name:$context_receiver_0 index:0 type:java.util.Comparator.>{ kotlin.Comparator.> } + VALUE_PARAMETER name:$context_receiver_0 index:0 type:java.util.Comparator.> BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun ($context_receiver_0: java.util.Comparator.>{ kotlin.Comparator.> }): T of . declared in ' + RETURN type=kotlin.Nothing from='public final fun ($context_receiver_0: java.util.Comparator.>): T of . declared in ' WHEN type=T of . origin=IF BRANCH if: CALL 'public final fun less (arg0: kotlin.Int, arg1: kotlin.Int): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=LT - arg0: CALL 'public final fun compareTo ($context_receiver_0: java.util.Comparator.compareTo>{ kotlin.Comparator.compareTo> }, other: T of .compareTo): kotlin.Int declared in ' type=kotlin.Int origin=LT + arg0: CALL 'public final fun compareTo ($context_receiver_0: java.util.Comparator.compareTo>, other: T of .compareTo): kotlin.Int declared in ' type=kotlin.Int origin=LT : T of . $receiver: CALL 'public final fun (): A of .Pair declared in .Pair' type=T of . origin=GET_PROPERTY $this: GET_VAR ': .Pair., T of .> declared in .' type=.Pair., T of .> origin=null - $context_receiver_0: GET_VAR '$context_receiver_0: java.util.Comparator.>{ kotlin.Comparator.> } declared in .' type=java.util.Comparator.>{ kotlin.Comparator.> } origin=null + $context_receiver_0: GET_VAR '$context_receiver_0: java.util.Comparator.> declared in .' type=java.util.Comparator.> origin=null other: CALL 'public final fun (): B of .Pair declared in .Pair' type=T of . origin=GET_PROPERTY $this: GET_VAR ': .Pair., T of .> declared in .' type=.Pair., T of .> origin=null arg1: CONST Int type=kotlin.Int value=0 @@ -238,7 +238,7 @@ FILE fqName: fileName:/compareTo.kt $receiver: VALUE_PARAMETER name:$this$with type:java.util.Comparator BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.String declared in .box' - CALL 'public final fun ($context_receiver_0: java.util.Comparator.>{ kotlin.Comparator.> }): T of . declared in ' type=kotlin.String origin=GET_PROPERTY + CALL 'public final fun ($context_receiver_0: java.util.Comparator.>): T of . declared in ' type=kotlin.String origin=GET_PROPERTY : kotlin.String $receiver: CONSTRUCTOR_CALL 'public constructor (first: A of .Pair, second: B of .Pair) declared in .Pair' type=.Pair origin=null : kotlin.String diff --git a/compiler/testData/ir/irText/declarations/delegatedProperties.ir.txt b/compiler/testData/ir/irText/declarations/delegatedProperties.ir.txt index 23bdebd5fc6..3736e521179 100644 --- a/compiler/testData/ir/irText/declarations/delegatedProperties.ir.txt +++ b/compiler/testData/ir/irText/declarations/delegatedProperties.ir.txt @@ -101,9 +101,9 @@ FILE fqName: fileName:/delegatedProperties.kt public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY name:test4 visibility:public modality:FINAL [delegated,var] - FIELD PROPERTY_DELEGATE name:test4$delegate type:java.util.HashMap{ kotlin.collections.HashMap } visibility:private [final,static] + FIELD PROPERTY_DELEGATE name:test4$delegate type:java.util.HashMap visibility:private [final,static] EXPRESSION_BODY - CALL 'public final fun hashMapOf (): java.util.HashMap{ kotlin.collections.HashMap } declared in kotlin.collections' type=java.util.HashMap{ kotlin.collections.HashMap } origin=null + CALL 'public final fun hashMapOf (): java.util.HashMap declared in kotlin.collections' type=java.util.HashMap origin=null : kotlin.String : kotlin.Any FUN DELEGATED_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Any @@ -113,7 +113,7 @@ FILE fqName: fileName:/delegatedProperties.kt CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V1 of kotlin.collections.getValue declared in kotlin.collections' type=kotlin.Any origin=null : kotlin.Any : kotlin.Any - $receiver: GET_FIELD 'FIELD PROPERTY_DELEGATE name:test4$delegate type:java.util.HashMap{ kotlin.collections.HashMap } visibility:private [final,static]' type=java.util.HashMap{ kotlin.collections.HashMap } origin=null + $receiver: GET_FIELD 'FIELD PROPERTY_DELEGATE name:test4$delegate type:java.util.HashMap visibility:private [final,static]' type=java.util.HashMap origin=null thisRef: CONST Null type=kotlin.Nothing? value=null property: PROPERTY_REFERENCE 'public final test4: kotlin.Any' field=null getter='public final fun (): kotlin.Any declared in ' setter='public final fun (: kotlin.Any): kotlin.Unit declared in ' type=kotlin.reflect.KMutableProperty0 origin=PROPERTY_REFERENCE_FOR_DELEGATE FUN DELEGATED_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> (:kotlin.Any) returnType:kotlin.Unit @@ -123,7 +123,7 @@ FILE fqName: fileName:/delegatedProperties.kt RETURN type=kotlin.Nothing from='public final fun (: kotlin.Any): kotlin.Unit declared in ' CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.collections.setValue): kotlin.Unit declared in kotlin.collections' type=kotlin.Unit origin=null : kotlin.Any - $receiver: GET_FIELD 'FIELD PROPERTY_DELEGATE name:test4$delegate type:java.util.HashMap{ kotlin.collections.HashMap } visibility:private [final,static]' type=java.util.HashMap{ kotlin.collections.HashMap } origin=null + $receiver: GET_FIELD 'FIELD PROPERTY_DELEGATE name:test4$delegate type:java.util.HashMap visibility:private [final,static]' type=java.util.HashMap origin=null thisRef: CONST Null type=kotlin.Nothing? value=null property: PROPERTY_REFERENCE 'public final test4: kotlin.Any' field=null getter='public final fun (): kotlin.Any declared in ' setter='public final fun (: kotlin.Any): kotlin.Unit declared in ' type=kotlin.reflect.KMutableProperty0 origin=PROPERTY_REFERENCE_FOR_DELEGATE value: GET_VAR ': kotlin.Any declared in .' type=kotlin.Any origin=null diff --git a/compiler/testData/ir/irText/declarations/kt45308.fir.ir.txt b/compiler/testData/ir/irText/declarations/kt45308.fir.ir.txt deleted file mode 100644 index 13c2975cf08..00000000000 --- a/compiler/testData/ir/irText/declarations/kt45308.fir.ir.txt +++ /dev/null @@ -1,22 +0,0 @@ -Module: a -FILE fqName:a fileName:/a.kt - TYPEALIAS name:A visibility:public expandedType:kotlin.String -Module: b -FILE fqName:b fileName:/b.kt - FUN name:foo visibility:public modality:FINAL <> (f:kotlin.Function0) returnType:kotlin.String - VALUE_PARAMETER name:f index:0 type:kotlin.Function0 - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun foo (f: kotlin.Function0): kotlin.String declared in b' - CALL 'public abstract fun invoke (): R of kotlin.Function0 declared in kotlin.Function0' type=kotlin.String origin=INVOKE - $this: GET_VAR 'f: kotlin.Function0 declared in b.foo' type=kotlin.Function0 origin=VARIABLE_AS_FUNCTION -Module: c -FILE fqName: fileName:/c.kt - 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 foo (f: kotlin.Function0): kotlin.String declared in b' type=kotlin.String origin=null - f: FUN_EXPR type=kotlin.Function0 origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.String - BLOCK_BODY - RETURN type=kotlin.Nothing from='local final fun (): kotlin.String declared in .box' - CONST String type=kotlin.String value="OK" diff --git a/compiler/testData/ir/irText/declarations/kt45308.ir.txt b/compiler/testData/ir/irText/declarations/kt45308.ir.txt index bbf5f585f16..13c2975cf08 100644 --- a/compiler/testData/ir/irText/declarations/kt45308.ir.txt +++ b/compiler/testData/ir/irText/declarations/kt45308.ir.txt @@ -3,20 +3,20 @@ FILE fqName:a fileName:/a.kt TYPEALIAS name:A visibility:public expandedType:kotlin.String Module: b FILE fqName:b fileName:/b.kt - FUN name:foo visibility:public modality:FINAL <> (f:kotlin.Function0) returnType:kotlin.String{ a.A } - VALUE_PARAMETER name:f index:0 type:kotlin.Function0 + FUN name:foo visibility:public modality:FINAL <> (f:kotlin.Function0) returnType:kotlin.String + VALUE_PARAMETER name:f index:0 type:kotlin.Function0 BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun foo (f: kotlin.Function0): kotlin.String{ a.A } declared in b' - CALL 'public abstract fun invoke (): R of kotlin.Function0 declared in kotlin.Function0' type=kotlin.String{ a.A } origin=INVOKE - $this: GET_VAR 'f: kotlin.Function0 declared in b.foo' type=kotlin.Function0 origin=VARIABLE_AS_FUNCTION + RETURN type=kotlin.Nothing from='public final fun foo (f: kotlin.Function0): kotlin.String declared in b' + CALL 'public abstract fun invoke (): R of kotlin.Function0 declared in kotlin.Function0' type=kotlin.String origin=INVOKE + $this: GET_VAR 'f: kotlin.Function0 declared in b.foo' type=kotlin.Function0 origin=VARIABLE_AS_FUNCTION Module: c FILE fqName: fileName:/c.kt 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 foo (f: kotlin.Function0): kotlin.String{ a.A } declared in b' type=kotlin.String{ a.A } origin=null - f: FUN_EXPR type=kotlin.Function0 origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.String{ a.A } + CALL 'public final fun foo (f: kotlin.Function0): kotlin.String declared in b' type=kotlin.String origin=null + f: FUN_EXPR type=kotlin.Function0 origin=LAMBDA + FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.String BLOCK_BODY - RETURN type=kotlin.Nothing from='local final fun (): kotlin.String{ a.A } declared in .box' + RETURN type=kotlin.Nothing from='local final fun (): kotlin.String declared in .box' CONST String type=kotlin.String value="OK" diff --git a/compiler/testData/ir/irText/declarations/kt45308.kt b/compiler/testData/ir/irText/declarations/kt45308.kt index 55509470ccc..5daa2d4e27d 100644 --- a/compiler/testData/ir/irText/declarations/kt45308.kt +++ b/compiler/testData/ir/irText/declarations/kt45308.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // SKIP_KT_DUMP // IGNORE_BACKEND_K1: JS_IR // IGNORE_BACKEND_K1: JS_IR_ES6 diff --git a/compiler/testData/ir/irText/declarations/kt52677.ir.txt b/compiler/testData/ir/irText/declarations/kt52677.ir.txt index 1183142a3ed..d6eea73c403 100644 --- a/compiler/testData/ir/irText/declarations/kt52677.ir.txt +++ b/compiler/testData/ir/irText/declarations/kt52677.ir.txt @@ -34,38 +34,38 @@ FILE fqName: fileName:/kt52677.kt $this: VALUE_PARAMETER name: type:kotlin.Any CLASS CLASS name:LoginSuccessPacket modality:FINAL visibility:public [data] superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.LoginSuccessPacket - CONSTRUCTOR visibility:public <> (id:@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1{ .Uuid }>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1{ .Uuid }) returnType:.LoginSuccessPacket [primary] - VALUE_PARAMETER name:id index:0 type:@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1{ .Uuid }>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1{ .Uuid } + CONSTRUCTOR visibility:public <> (id:@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1) returnType:.LoginSuccessPacket [primary] + VALUE_PARAMETER name:id index:0 type:@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1 BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:LoginSuccessPacket modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' PROPERTY name:id visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:id type:@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1{ .Uuid }>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1{ .Uuid } visibility:private [final] + FIELD PROPERTY_BACKING_FIELD name:id type:@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1 visibility:private [final] EXPRESSION_BODY - GET_VAR 'id: @[MySerializable(c = ...)] .Uuid1{ .Uuid } declared in .LoginSuccessPacket.' type=@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1{ .Uuid }>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1{ .Uuid } origin=INITIALIZE_PROPERTY_FROM_PARAMETER - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.LoginSuccessPacket) returnType:@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1{ .Uuid }>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1{ .Uuid } + GET_VAR 'id: @[MySerializable(c = ...)] .Uuid1 declared in .LoginSuccessPacket.' type=@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1 origin=INITIALIZE_PROPERTY_FROM_PARAMETER + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.LoginSuccessPacket) returnType:@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1 correspondingProperty: PROPERTY name:id visibility:public modality:FINAL [val] $this: VALUE_PARAMETER name: type:.LoginSuccessPacket BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): @[MySerializable(c = ...)] .Uuid1{ .Uuid } declared in .LoginSuccessPacket' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:id type:@[MySerializable(c = ...)] .Uuid1{ .Uuid } visibility:private [final]' type=@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1{ .Uuid }>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1{ .Uuid } origin=null + RETURN type=kotlin.Nothing from='public final fun (): @[MySerializable(c = ...)] .Uuid1 declared in .LoginSuccessPacket' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:id type:@[MySerializable(c = ...)] .Uuid1 visibility:private [final]' type=@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1 origin=null receiver: GET_VAR ': .LoginSuccessPacket declared in .LoginSuccessPacket.' type=.LoginSuccessPacket origin=null - FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:.LoginSuccessPacket) returnType:@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1{ .Uuid }>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1{ .Uuid } [operator] + FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:.LoginSuccessPacket) returnType:@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1 [operator] $this: VALUE_PARAMETER name: type:.LoginSuccessPacket BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun component1 (): @[MySerializable(c = ...)] .Uuid1{ .Uuid } declared in .LoginSuccessPacket' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:id type:@[MySerializable(c = ...)] .Uuid1{ .Uuid } visibility:private [final]' type=@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1{ .Uuid }>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1{ .Uuid } origin=null + RETURN type=kotlin.Nothing from='public final fun component1 (): @[MySerializable(c = ...)] .Uuid1 declared in .LoginSuccessPacket' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:id type:@[MySerializable(c = ...)] .Uuid1 visibility:private [final]' type=@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1 origin=null receiver: GET_VAR ': .LoginSuccessPacket declared in .LoginSuccessPacket.component1' type=.LoginSuccessPacket origin=null - FUN GENERATED_DATA_CLASS_MEMBER name:copy visibility:public modality:FINAL <> ($this:.LoginSuccessPacket, id:@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1{ .Uuid }>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1{ .Uuid }) returnType:.LoginSuccessPacket + FUN GENERATED_DATA_CLASS_MEMBER name:copy visibility:public modality:FINAL <> ($this:.LoginSuccessPacket, id:@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1) returnType:.LoginSuccessPacket $this: VALUE_PARAMETER name: type:.LoginSuccessPacket - VALUE_PARAMETER name:id index:0 type:@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1{ .Uuid }>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1{ .Uuid } + VALUE_PARAMETER name:id index:0 type:@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1 EXPRESSION_BODY - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:id type:@[MySerializable(c = ...)] .Uuid1{ .Uuid } visibility:private [final]' type=@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1{ .Uuid }>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1{ .Uuid } origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:id type:@[MySerializable(c = ...)] .Uuid1 visibility:private [final]' type=@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1 origin=null receiver: GET_VAR ': .LoginSuccessPacket declared in .LoginSuccessPacket.copy' type=.LoginSuccessPacket origin=null BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun copy (id: @[MySerializable(c = ...)] .Uuid1{ .Uuid }): .LoginSuccessPacket declared in .LoginSuccessPacket' - CONSTRUCTOR_CALL 'public constructor (id: @[MySerializable(c = ...)] .Uuid1{ .Uuid }) declared in .LoginSuccessPacket' type=.LoginSuccessPacket origin=null - id: GET_VAR 'id: @[MySerializable(c = ...)] .Uuid1{ .Uuid } declared in .LoginSuccessPacket.copy' type=@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1{ .Uuid }>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1{ .Uuid } origin=null + RETURN type=kotlin.Nothing from='public final fun copy (id: @[MySerializable(c = ...)] .Uuid1): .LoginSuccessPacket declared in .LoginSuccessPacket' + CONSTRUCTOR_CALL 'public constructor (id: @[MySerializable(c = ...)] .Uuid1) declared in .LoginSuccessPacket' type=.LoginSuccessPacket origin=null + id: GET_VAR 'id: @[MySerializable(c = ...)] .Uuid1 declared in .LoginSuccessPacket.copy' type=@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1 origin=null FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:.LoginSuccessPacket) returnType:kotlin.String overridden: public open fun toString (): kotlin.String declared in kotlin.Any @@ -75,7 +75,7 @@ FILE fqName: fileName:/kt52677.kt STRING_CONCATENATION type=kotlin.String CONST String type=kotlin.String value="LoginSuccessPacket(" CONST String type=kotlin.String value="id=" - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:id type:@[MySerializable(c = ...)] .Uuid1{ .Uuid } visibility:private [final]' type=@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1{ .Uuid }>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1{ .Uuid } origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:id type:@[MySerializable(c = ...)] .Uuid1 visibility:private [final]' type=@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1 origin=null receiver: GET_VAR ': .LoginSuccessPacket declared in .LoginSuccessPacket.toString' type=.LoginSuccessPacket origin=null CONST String type=kotlin.String value=")" FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:.LoginSuccessPacket) returnType:kotlin.Int @@ -85,7 +85,7 @@ FILE fqName: fileName:/kt52677.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in .LoginSuccessPacket' CALL 'public open fun hashCode (): kotlin.Int declared in .Uuid1' type=kotlin.Int origin=null - $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:id type:@[MySerializable(c = ...)] .Uuid1{ .Uuid } visibility:private [final]' type=@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1{ .Uuid }>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1{ .Uuid } origin=null + $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:id type:@[MySerializable(c = ...)] .Uuid1 visibility:private [final]' type=@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1 origin=null receiver: GET_VAR ': .LoginSuccessPacket declared in .LoginSuccessPacket.hashCode' type=.LoginSuccessPacket origin=null FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:.LoginSuccessPacket, other:kotlin.Any?) returnType:kotlin.Boolean [operator] overridden: @@ -113,15 +113,15 @@ FILE fqName: fileName:/kt52677.kt BRANCH if: CALL 'public final fun not (): kotlin.Boolean declared in kotlin.Boolean' type=kotlin.Boolean origin=EXCLEQ $this: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EXCLEQ - arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:id type:@[MySerializable(c = ...)] .Uuid1{ .Uuid } visibility:private [final]' type=@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1{ .Uuid }>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1{ .Uuid } origin=null + arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:id type:@[MySerializable(c = ...)] .Uuid1 visibility:private [final]' type=@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1 origin=null receiver: GET_VAR ': .LoginSuccessPacket declared in .LoginSuccessPacket.equals' type=.LoginSuccessPacket origin=null - arg1: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:id type:@[MySerializable(c = ...)] .Uuid1{ .Uuid } visibility:private [final]' type=@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1{ .Uuid }>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1{ .Uuid } origin=null + arg1: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:id type:@[MySerializable(c = ...)] .Uuid1 visibility:private [final]' type=@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1 origin=null receiver: GET_VAR 'val tmp_0: .LoginSuccessPacket declared in .LoginSuccessPacket.equals' type=.LoginSuccessPacket origin=null then: RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in .LoginSuccessPacket' CONST Boolean type=kotlin.Boolean value=false RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in .LoginSuccessPacket' CONST Boolean type=kotlin.Boolean value=true - TYPEALIAS name:Uuid visibility:public expandedType:@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1{ .Uuid }>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1 + TYPEALIAS name:Uuid visibility:public expandedType:@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1 CLASS INTERFACE name:MySerializer modality:ABSTRACT visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.MySerializer.MySerializer> TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false @@ -138,12 +138,12 @@ FILE fqName: fileName:/kt52677.kt overridden: public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any - CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1{ .Uuid }>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1{ .Uuid }>] + CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1>] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.UuidSerializer CONSTRUCTOR visibility:private <> () returnType:.UuidSerializer [primary] BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in kotlin.Any' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1{ .Uuid }>]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1>]' 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 .MySerializer @@ -176,11 +176,11 @@ FILE fqName: fileName:/kt52677.kt overridden: public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any - FUN name:foo visibility:public modality:FINAL <> () returnType:@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1{ .Uuid }>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1{ .Uuid } + FUN name:foo visibility:public modality:FINAL <> () returnType:@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1 BLOCK_BODY THROW type=kotlin.Nothing CONSTRUCTOR_CALL 'public constructor () declared in java.lang.RuntimeException' type=java.lang.RuntimeException origin=null - FUN name:bar visibility:public modality:FINAL <> () returnType:@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1{ .Uuid }>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1{ .Uuid } + FUN name:bar visibility:public modality:FINAL <> () returnType:@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1 BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun bar (): @[MySerializable(c = ...)] .Uuid1{ .Uuid } declared in ' - CALL 'public final fun foo (): @[MySerializable(c = ...)] .Uuid1{ .Uuid } declared in ' type=@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1{ .Uuid }>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1{ .Uuid } origin=null + RETURN type=kotlin.Nothing from='public final fun bar (): @[MySerializable(c = ...)] .Uuid1 declared in ' + CALL 'public final fun foo (): @[MySerializable(c = ...)] .Uuid1 declared in ' type=@[MySerializable(c = CLASS_REFERENCE 'CLASS OBJECT name:UuidSerializer modality:FINAL visibility:public superTypes:[.MySerializer<@[MySerializable(c = ...)] .Uuid1>]' type=kotlin.reflect.KClass<.UuidSerializer>)] .Uuid1 origin=null diff --git a/compiler/testData/ir/irText/declarations/localDelegatedProperties.ir.txt b/compiler/testData/ir/irText/declarations/localDelegatedProperties.ir.txt index e2ae705a8ce..8feb668833c 100644 --- a/compiler/testData/ir/irText/declarations/localDelegatedProperties.ir.txt +++ b/compiler/testData/ir/irText/declarations/localDelegatedProperties.ir.txt @@ -23,8 +23,8 @@ FILE fqName: fileName:/localDelegatedProperties.kt FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY LOCAL_DELEGATED_PROPERTY name:x type:kotlin.Int flags:var - VAR PROPERTY_DELEGATE name:x$delegate type:java.util.HashMap{ kotlin.collections.HashMap } [val] - CALL 'public final fun hashMapOf (): java.util.HashMap{ kotlin.collections.HashMap } declared in kotlin.collections' type=java.util.HashMap{ kotlin.collections.HashMap } origin=null + VAR PROPERTY_DELEGATE name:x$delegate type:java.util.HashMap [val] + CALL 'public final fun hashMapOf (): java.util.HashMap declared in kotlin.collections' type=java.util.HashMap origin=null : kotlin.String : kotlin.Int FUN DELEGATED_PROPERTY_ACCESSOR name: visibility:local modality:FINAL <> () returnType:kotlin.Int @@ -33,18 +33,18 @@ FILE fqName: fileName:/localDelegatedProperties.kt CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V1 of kotlin.collections.getValue declared in kotlin.collections' type=kotlin.Int origin=null : kotlin.Int : kotlin.Int - $receiver: GET_VAR 'val x$delegate: java.util.HashMap{ kotlin.collections.HashMap } declared in .test2' type=java.util.HashMap{ kotlin.collections.HashMap } origin=null + $receiver: GET_VAR 'val x$delegate: java.util.HashMap declared in .test2' type=java.util.HashMap origin=null thisRef: CONST Null type=kotlin.Nothing? value=null - property: LOCAL_DELEGATED_PROPERTY_REFERENCE 'var x: kotlin.Int by (...)' delegate='val x$delegate: java.util.HashMap{ kotlin.collections.HashMap } declared in .test2' getter='local final fun (): kotlin.Int declared in .test2' setter='local final fun (value: kotlin.Int): kotlin.Unit declared in .test2' type=kotlin.reflect.KMutableProperty0 origin=PROPERTY_REFERENCE_FOR_DELEGATE + property: LOCAL_DELEGATED_PROPERTY_REFERENCE 'var x: kotlin.Int by (...)' delegate='val x$delegate: java.util.HashMap declared in .test2' getter='local final fun (): kotlin.Int declared in .test2' setter='local final fun (value: kotlin.Int): kotlin.Unit declared in .test2' type=kotlin.reflect.KMutableProperty0 origin=PROPERTY_REFERENCE_FOR_DELEGATE FUN DELEGATED_PROPERTY_ACCESSOR name: visibility:local modality:FINAL <> (value:kotlin.Int) returnType:kotlin.Unit VALUE_PARAMETER name:value index:0 type:kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (value: kotlin.Int): kotlin.Unit declared in .test2' CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.collections.setValue): kotlin.Unit declared in kotlin.collections' type=kotlin.Unit origin=null : kotlin.Int - $receiver: GET_VAR 'val x$delegate: java.util.HashMap{ kotlin.collections.HashMap } declared in .test2' type=java.util.HashMap{ kotlin.collections.HashMap } origin=null + $receiver: GET_VAR 'val x$delegate: java.util.HashMap declared in .test2' type=java.util.HashMap origin=null thisRef: CONST Null type=kotlin.Nothing? value=null - property: LOCAL_DELEGATED_PROPERTY_REFERENCE 'var x: kotlin.Int by (...)' delegate='val x$delegate: java.util.HashMap{ kotlin.collections.HashMap } declared in .test2' getter='local final fun (): kotlin.Int declared in .test2' setter='local final fun (value: kotlin.Int): kotlin.Unit declared in .test2' type=kotlin.reflect.KMutableProperty0 origin=PROPERTY_REFERENCE_FOR_DELEGATE + property: LOCAL_DELEGATED_PROPERTY_REFERENCE 'var x: kotlin.Int by (...)' delegate='val x$delegate: java.util.HashMap declared in .test2' getter='local final fun (): kotlin.Int declared in .test2' setter='local final fun (value: kotlin.Int): kotlin.Unit declared in .test2' type=kotlin.reflect.KMutableProperty0 origin=PROPERTY_REFERENCE_FOR_DELEGATE value: GET_VAR 'value: kotlin.Int declared in .test2.' type=kotlin.Int origin=null CALL 'local final fun (value: kotlin.Int): kotlin.Unit declared in .test2' type=kotlin.Unit origin=EQ value: CONST Int type=kotlin.Int value=0 diff --git a/compiler/testData/ir/irText/declarations/packageLevelProperties.ir.txt b/compiler/testData/ir/irText/declarations/packageLevelProperties.ir.txt index 1dcfcfb558a..fa4f5b5114a 100644 --- a/compiler/testData/ir/irText/declarations/packageLevelProperties.ir.txt +++ b/compiler/testData/ir/irText/declarations/packageLevelProperties.ir.txt @@ -88,9 +88,9 @@ FILE fqName: fileName:/packageLevelProperties.kt thisRef: CONST Null type=kotlin.Nothing? value=null property: PROPERTY_REFERENCE 'public final test7: kotlin.Int' field=null getter='public final fun (): kotlin.Int declared in ' setter=null type=kotlin.reflect.KProperty0 origin=PROPERTY_REFERENCE_FOR_DELEGATE PROPERTY name:test8 visibility:public modality:FINAL [delegated,var] - FIELD PROPERTY_DELEGATE name:test8$delegate type:java.util.HashMap{ kotlin.collections.HashMap } visibility:private [final,static] + FIELD PROPERTY_DELEGATE name:test8$delegate type:java.util.HashMap visibility:private [final,static] EXPRESSION_BODY - CALL 'public final fun hashMapOf (): java.util.HashMap{ kotlin.collections.HashMap } declared in kotlin.collections' type=java.util.HashMap{ kotlin.collections.HashMap } origin=null + CALL 'public final fun hashMapOf (): java.util.HashMap declared in kotlin.collections' type=java.util.HashMap origin=null : kotlin.String : kotlin.Int FUN DELEGATED_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int @@ -100,7 +100,7 @@ FILE fqName: fileName:/packageLevelProperties.kt CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V1 of kotlin.collections.getValue declared in kotlin.collections' type=kotlin.Int origin=null : kotlin.Int : kotlin.Int - $receiver: GET_FIELD 'FIELD PROPERTY_DELEGATE name:test8$delegate type:java.util.HashMap{ kotlin.collections.HashMap } visibility:private [final,static]' type=java.util.HashMap{ kotlin.collections.HashMap } origin=null + $receiver: GET_FIELD 'FIELD PROPERTY_DELEGATE name:test8$delegate type:java.util.HashMap visibility:private [final,static]' type=java.util.HashMap origin=null thisRef: CONST Null type=kotlin.Nothing? value=null property: PROPERTY_REFERENCE 'public final test8: 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 @@ -110,7 +110,7 @@ FILE fqName: fileName:/packageLevelProperties.kt RETURN type=kotlin.Nothing from='public final fun (: kotlin.Int): kotlin.Unit declared in ' CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.collections.setValue): kotlin.Unit declared in kotlin.collections' type=kotlin.Unit origin=null : kotlin.Int - $receiver: GET_FIELD 'FIELD PROPERTY_DELEGATE name:test8$delegate type:java.util.HashMap{ kotlin.collections.HashMap } visibility:private [final,static]' type=java.util.HashMap{ kotlin.collections.HashMap } origin=null + $receiver: GET_FIELD 'FIELD PROPERTY_DELEGATE name:test8$delegate type:java.util.HashMap visibility:private [final,static]' type=java.util.HashMap origin=null thisRef: CONST Null type=kotlin.Nothing? value=null property: PROPERTY_REFERENCE 'public final test8: 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 value: GET_VAR ': kotlin.Int declared in .' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/declarations/parameters/useNextParamInLambda.ir.txt b/compiler/testData/ir/irText/declarations/parameters/useNextParamInLambda.ir.txt index 4fd4f81b539..36aa2fc111a 100644 --- a/compiler/testData/ir/irText/declarations/parameters/useNextParamInLambda.ir.txt +++ b/compiler/testData/ir/irText/declarations/parameters/useNextParamInLambda.ir.txt @@ -27,8 +27,8 @@ FILE fqName: fileName:/useNextParamInLambda.kt try: BLOCK type=kotlin.Unit origin=null TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit CALL 'public final fun f (f1: kotlin.Function0, f2: kotlin.Function0): kotlin.String declared in ' type=kotlin.String origin=null - CATCH parameter=val e: java.lang.Exception{ kotlin.Exception } declared in .box - VAR CATCH_PARAMETER name:e type:java.lang.Exception{ kotlin.Exception } [val] + CATCH parameter=val e: java.lang.Exception declared in .box + VAR CATCH_PARAMETER name:e type:java.lang.Exception [val] BLOCK type=kotlin.Unit origin=null SET_VAR 'var result: kotlin.String declared in .box' type=kotlin.Unit origin=EQ CONST String type=kotlin.String value="OK" diff --git a/compiler/testData/ir/irText/expressions/catchParameterAccess.fir.ir.txt b/compiler/testData/ir/irText/expressions/catchParameterAccess.fir.ir.txt deleted file mode 100644 index 128ba7a39cd..00000000000 --- a/compiler/testData/ir/irText/expressions/catchParameterAccess.fir.ir.txt +++ /dev/null @@ -1,14 +0,0 @@ -FILE fqName: fileName:/catchParameterAccess.kt - FUN name:test visibility:public modality:FINAL <> (f:kotlin.Function0) returnType:kotlin.Unit - VALUE_PARAMETER name:f index:0 type:kotlin.Function0 - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test (f: kotlin.Function0): kotlin.Unit declared in ' - TRY type=kotlin.Unit - try: BLOCK type=kotlin.Unit origin=null - CALL 'public abstract fun invoke (): R of kotlin.Function0 declared in kotlin.Function0' type=kotlin.Unit origin=INVOKE - $this: GET_VAR 'f: kotlin.Function0 declared in .test' type=kotlin.Function0 origin=VARIABLE_AS_FUNCTION - CATCH parameter=val e: java.lang.Exception declared in .test - VAR CATCH_PARAMETER name:e type:java.lang.Exception [val] - BLOCK type=kotlin.Nothing origin=null - THROW type=kotlin.Nothing - GET_VAR 'val e: java.lang.Exception declared in .test' type=java.lang.Exception origin=null diff --git a/compiler/testData/ir/irText/expressions/catchParameterAccess.fir.kt.txt b/compiler/testData/ir/irText/expressions/catchParameterAccess.fir.kt.txt deleted file mode 100644 index 59bba22372c..00000000000 --- a/compiler/testData/ir/irText/expressions/catchParameterAccess.fir.kt.txt +++ /dev/null @@ -1,10 +0,0 @@ -fun test(f: Function0) { - return try { // BLOCK - f.invoke() - } - catch (e: Exception){ // BLOCK - throw e - } - -} - diff --git a/compiler/testData/ir/irText/expressions/catchParameterAccess.ir.txt b/compiler/testData/ir/irText/expressions/catchParameterAccess.ir.txt index 2b5161076f8..128ba7a39cd 100644 --- a/compiler/testData/ir/irText/expressions/catchParameterAccess.ir.txt +++ b/compiler/testData/ir/irText/expressions/catchParameterAccess.ir.txt @@ -7,8 +7,8 @@ FILE fqName: fileName:/catchParameterAccess.kt try: BLOCK type=kotlin.Unit origin=null CALL 'public abstract fun invoke (): R of kotlin.Function0 declared in kotlin.Function0' type=kotlin.Unit origin=INVOKE $this: GET_VAR 'f: kotlin.Function0 declared in .test' type=kotlin.Function0 origin=VARIABLE_AS_FUNCTION - CATCH parameter=val e: java.lang.Exception{ kotlin.Exception } declared in .test - VAR CATCH_PARAMETER name:e type:java.lang.Exception{ kotlin.Exception } [val] + CATCH parameter=val e: java.lang.Exception declared in .test + VAR CATCH_PARAMETER name:e type:java.lang.Exception [val] BLOCK type=kotlin.Nothing origin=null THROW type=kotlin.Nothing - GET_VAR 'val e: java.lang.Exception{ kotlin.Exception } declared in .test' type=java.lang.Exception{ kotlin.Exception } origin=null + GET_VAR 'val e: java.lang.Exception declared in .test' type=java.lang.Exception origin=null diff --git a/compiler/testData/ir/irText/expressions/catchParameterAccess.kt b/compiler/testData/ir/irText/expressions/catchParameterAccess.kt index e8e6cfbcfef..bcedd205283 100644 --- a/compiler/testData/ir/irText/expressions/catchParameterAccess.kt +++ b/compiler/testData/ir/irText/expressions/catchParameterAccess.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // IGNORE_BACKEND: JS_IR // IGNORE_BACKEND: JS_IR_ES6 diff --git a/compiler/testData/ir/irText/expressions/kt16905.ir.txt b/compiler/testData/ir/irText/expressions/kt16905.ir.txt index 336d7978db2..2fba848a032 100644 --- a/compiler/testData/ir/irText/expressions/kt16905.ir.txt +++ b/compiler/testData/ir/irText/expressions/kt16905.ir.txt @@ -46,14 +46,14 @@ FILE fqName: fileName:/kt16905.kt overridden: public open fun toString (): kotlin.String declared in .Outer.Inner $this: VALUE_PARAMETER name: type:kotlin.Any - CLASS CLASS name:InnerDerived1 modality:FINAL visibility:public [inner] superTypes:[.Outer.Inner{ .OI }] + CLASS CLASS name:InnerDerived1 modality:FINAL visibility:public [inner] superTypes:[.Outer.Inner] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Outer.InnerDerived1 CONSTRUCTOR visibility:public <> ($this:.Outer) returnType:.Outer.InnerDerived1 [primary] $outer: VALUE_PARAMETER name: type:.Outer BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in .Outer.Inner' $this: GET_VAR ': .Outer declared in .Outer.InnerDerived1.' type=.Outer origin=null - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:InnerDerived1 modality:FINAL visibility:public [inner] superTypes:[.Outer.Inner{ .OI }]' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:InnerDerived1 modality:FINAL visibility:public [inner] superTypes:[.Outer.Inner]' 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 .Outer.Inner @@ -81,8 +81,8 @@ FILE fqName: fileName:/kt16905.kt public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any TYPEALIAS name:OI visibility:public expandedType:.Outer.Inner - FUN name:test visibility:public modality:FINAL <> () returnType:.Outer.Inner{ .OI } + FUN name:test visibility:public modality:FINAL <> () returnType:.Outer.Inner BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test (): .Outer.Inner{ .OI } declared in ' + RETURN type=kotlin.Nothing from='public final fun test (): .Outer.Inner declared in ' CONSTRUCTOR_CALL 'public constructor () declared in .Outer.Inner' type=.Outer.Inner origin=null $outer: CONSTRUCTOR_CALL 'public constructor () declared in .Outer' type=.Outer origin=null diff --git a/compiler/testData/ir/irText/expressions/kt48806.fir.ir.txt b/compiler/testData/ir/irText/expressions/kt48806.fir.ir.txt deleted file mode 100644 index 24d52667edb..00000000000 --- a/compiler/testData/ir/irText/expressions/kt48806.fir.ir.txt +++ /dev/null @@ -1,56 +0,0 @@ -FILE fqName: fileName:/kt48806.kt - CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Any] - $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.A - CONSTRUCTOR visibility:public <> () returnType:.A [primary] - BLOCK_BODY - DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in kotlin.Any' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Any]' - PROPERTY name:test_1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test_1 type:kotlin.Int visibility:private [final] - EXPRESSION_BODY - TRY type=kotlin.Int - try: BLOCK type=kotlin.Nothing origin=null - THROW type=kotlin.Nothing - CONSTRUCTOR_CALL 'public constructor () declared in java.lang.RuntimeException' type=java.lang.RuntimeException origin=null - CATCH parameter=val e: java.lang.Exception declared in .A.test_1 - VAR CATCH_PARAMETER name:e type:java.lang.Exception [val] - BLOCK type=kotlin.Int origin=null - CONST Int type=kotlin.Int value=1 - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.A) returnType:kotlin.Int - correspondingProperty: PROPERTY name:test_1 visibility:public modality:FINAL [val] - $this: VALUE_PARAMETER name: type:.A - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .A' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_1 type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null - receiver: GET_VAR ': .A declared in .A.' type=.A origin=null - PROPERTY name:test_2 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test_2 type:kotlin.Int visibility:private [final] - EXPRESSION_BODY - TRY type=kotlin.Int - try: BLOCK type=kotlin.Int origin=null - CONST Int type=kotlin.Int value=1 - CATCH parameter=val e: java.lang.Exception declared in .A.test_2 - VAR CATCH_PARAMETER name:e type:java.lang.Exception [val] - BLOCK type=kotlin.Nothing origin=null - THROW type=kotlin.Nothing - CONSTRUCTOR_CALL 'public constructor () declared in java.lang.RuntimeException' type=java.lang.RuntimeException origin=null - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.A) returnType:kotlin.Int - correspondingProperty: PROPERTY name:test_2 visibility:public modality:FINAL [val] - $this: VALUE_PARAMETER name: type:.A - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .A' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_2 type:kotlin.Int visibility:private [final]' type=kotlin.Int origin=null - receiver: GET_VAR ': .A declared in .A.' type=.A origin=null - FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] - overridden: - public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any - $this: VALUE_PARAMETER name: type:kotlin.Any - VALUE_PARAMETER name:other index:0 type:kotlin.Any? - FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override] - overridden: - public open fun hashCode (): kotlin.Int declared in kotlin.Any - $this: VALUE_PARAMETER name: type:kotlin.Any - FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override] - overridden: - public open fun toString (): kotlin.String declared in kotlin.Any - $this: VALUE_PARAMETER name: type:kotlin.Any diff --git a/compiler/testData/ir/irText/expressions/kt48806.fir.kt.txt b/compiler/testData/ir/irText/expressions/kt48806.fir.kt.txt deleted file mode 100644 index 74f230466fd..00000000000 --- a/compiler/testData/ir/irText/expressions/kt48806.fir.kt.txt +++ /dev/null @@ -1,29 +0,0 @@ -class A { - constructor() /* primary */ { - super/*Any*/() - /* () */ - - } - - val test_1: Int - field = try { // BLOCK - throw RuntimeException() - } - catch (e: Exception){ // BLOCK - 1 - } - - get - - val test_2: Int - field = try { // BLOCK - 1 - } - catch (e: Exception){ // BLOCK - throw RuntimeException() - } - - get - -} - diff --git a/compiler/testData/ir/irText/expressions/kt48806.ir.txt b/compiler/testData/ir/irText/expressions/kt48806.ir.txt index 40edd6b442f..24d52667edb 100644 --- a/compiler/testData/ir/irText/expressions/kt48806.ir.txt +++ b/compiler/testData/ir/irText/expressions/kt48806.ir.txt @@ -12,8 +12,8 @@ FILE fqName: fileName:/kt48806.kt try: BLOCK type=kotlin.Nothing origin=null THROW type=kotlin.Nothing CONSTRUCTOR_CALL 'public constructor () declared in java.lang.RuntimeException' type=java.lang.RuntimeException origin=null - CATCH parameter=val e: java.lang.Exception{ kotlin.Exception } declared in .A.test_1 - VAR CATCH_PARAMETER name:e type:java.lang.Exception{ kotlin.Exception } [val] + CATCH parameter=val e: java.lang.Exception declared in .A.test_1 + VAR CATCH_PARAMETER name:e type:java.lang.Exception [val] BLOCK type=kotlin.Int origin=null CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.A) returnType:kotlin.Int @@ -29,8 +29,8 @@ FILE fqName: fileName:/kt48806.kt TRY type=kotlin.Int try: BLOCK type=kotlin.Int origin=null CONST Int type=kotlin.Int value=1 - CATCH parameter=val e: java.lang.Exception{ kotlin.Exception } declared in .A.test_2 - VAR CATCH_PARAMETER name:e type:java.lang.Exception{ kotlin.Exception } [val] + CATCH parameter=val e: java.lang.Exception declared in .A.test_2 + VAR CATCH_PARAMETER name:e type:java.lang.Exception [val] BLOCK type=kotlin.Nothing origin=null THROW type=kotlin.Nothing CONSTRUCTOR_CALL 'public constructor () declared in java.lang.RuntimeException' type=java.lang.RuntimeException origin=null diff --git a/compiler/testData/ir/irText/expressions/kt48806.kt b/compiler/testData/ir/irText/expressions/kt48806.kt index 37aba4022df..136d18d8328 100644 --- a/compiler/testData/ir/irText/expressions/kt48806.kt +++ b/compiler/testData/ir/irText/expressions/kt48806.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // IGNORE_BACKEND: JS_IR // IGNORE_BACKEND: JS_IR_ES6 // ISSUE: KT-48806 diff --git a/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.ir.txt b/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.ir.txt index 248d40b460e..92c8bc1feb2 100644 --- a/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.ir.txt +++ b/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.ir.txt @@ -32,9 +32,9 @@ FILE fqName: fileName:/specializedTypeAliasConstructorCall.kt public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any TYPEALIAS name:IntAlias visibility:public expandedType:.Cell - FUN name:test visibility:public modality:FINAL <> () returnType:.Cell{ .IntAlias } + FUN name:test visibility:public modality:FINAL <> () returnType:.Cell BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test (): .Cell{ .IntAlias } declared in ' + RETURN type=kotlin.Nothing from='public final fun test (): .Cell declared in ' CONSTRUCTOR_CALL 'public constructor (value: T of .Cell) declared in .Cell' type=.Cell origin=null : kotlin.Int value: CONST Int type=kotlin.Int value=42 diff --git a/compiler/testData/ir/irText/expressions/typeAliasConstructorReference.ir.txt b/compiler/testData/ir/irText/expressions/typeAliasConstructorReference.ir.txt index 25ab2cffff3..6bb60b5b68c 100644 --- a/compiler/testData/ir/irText/expressions/typeAliasConstructorReference.ir.txt +++ b/compiler/testData/ir/irText/expressions/typeAliasConstructorReference.ir.txt @@ -61,20 +61,20 @@ FILE fqName: fileName:/typeAliasConstructorReference.kt $this: VALUE_PARAMETER name: type:kotlin.Any TYPEALIAS name:NA visibility:public expandedType:.Host.Nested PROPERTY name:test1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function1.C{ .CA }> visibility:private [final,static] + 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{ .CA }> origin=null reflectionTarget= - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Function1.C{ .CA }> + 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 - RETURN type=kotlin.Nothing from='public final fun (): kotlin.Function1.C{ .CA }> declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function1.C{ .CA }> visibility:private [final,static]' type=kotlin.Function1.C{ .CA }> origin=null + RETURN type=kotlin.Nothing from='public final fun (): kotlin.Function1.C> declared in ' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function1.C> visibility:private [final,static]' type=kotlin.Function1.C> origin=null PROPERTY name:test2 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Function1.Host.Nested{ .NA }> visibility:private [final,static] + 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{ .NA }> origin=null reflectionTarget= - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Function1.Host.Nested{ .NA }> + 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 - RETURN type=kotlin.Nothing from='public final fun (): kotlin.Function1.Host.Nested{ .NA }> declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Function1.Host.Nested{ .NA }> visibility:private [final,static]' type=kotlin.Function1.Host.Nested{ .NA }> origin=null + RETURN type=kotlin.Nothing from='public final fun (): kotlin.Function1.Host.Nested> declared in ' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Function1.Host.Nested> visibility:private [final,static]' type=kotlin.Function1.Host.Nested> origin=null diff --git a/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.ir.txt b/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.ir.txt index 4f153287182..61e04046583 100644 --- a/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.ir.txt +++ b/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.ir.txt @@ -123,16 +123,16 @@ FILE fqName: fileName:/ClashResolutionDescriptor.kt public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any PROPERTY name:registrationMap visibility:private modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:registrationMap type:java.util.HashMap{ kotlin.collections.HashMap } visibility:private [final,static] + FIELD PROPERTY_BACKING_FIELD name:registrationMap type:java.util.HashMap visibility:private [final,static] EXPRESSION_BODY - CALL 'public final fun hashMapOf (): java.util.HashMap{ kotlin.collections.HashMap } declared in kotlin.collections' type=java.util.HashMap{ kotlin.collections.HashMap } origin=null + CALL 'public final fun hashMapOf (): java.util.HashMap declared in kotlin.collections' type=java.util.HashMap origin=null : java.lang.reflect.Type : kotlin.Any - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:private modality:FINAL <> () returnType:java.util.HashMap{ kotlin.collections.HashMap } + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:private modality:FINAL <> () returnType:java.util.HashMap correspondingProperty: PROPERTY name:registrationMap visibility:private modality:FINAL [val] BLOCK_BODY - RETURN type=kotlin.Nothing from='private final fun (): java.util.HashMap{ kotlin.collections.HashMap } declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:registrationMap type:java.util.HashMap{ kotlin.collections.HashMap } visibility:private [final,static]' type=java.util.HashMap{ kotlin.collections.HashMap } origin=null + RETURN type=kotlin.Nothing from='private final fun (): java.util.HashMap declared in ' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:registrationMap type:java.util.HashMap visibility:private [final,static]' type=java.util.HashMap origin=null FUN name:resolveClashesIfAny visibility:public modality:FINAL <> (container:.ComponentContainer, clashResolvers:kotlin.collections.List<.PlatformExtensionsClashResolver<*>>) returnType:kotlin.Unit VALUE_PARAMETER name:container index:0 type:.ComponentContainer VALUE_PARAMETER name:clashResolvers index:1 type:kotlin.collections.List<.PlatformExtensionsClashResolver<*>> @@ -154,7 +154,7 @@ FILE fqName: fileName:/ClashResolutionDescriptor.kt VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:kotlin.collections.Collection<.ComponentDescriptor>? [val] TYPE_OP type=kotlin.collections.Collection<.ComponentDescriptor>? origin=SAFE_CAST typeOperand=kotlin.collections.Collection<.ComponentDescriptor> CALL 'public open fun get (key: @[EnhancedNullability] K of java.util.HashMap): @[EnhancedNullability] V of java.util.HashMap? declared in java.util.HashMap' type=@[EnhancedNullability] kotlin.Any? origin=GET_ARRAY_ELEMENT - $this: CALL 'private final fun (): java.util.HashMap{ kotlin.collections.HashMap } declared in ' type=java.util.HashMap{ kotlin.collections.HashMap } origin=GET_PROPERTY + $this: CALL 'private final fun (): java.util.HashMap declared in ' type=java.util.HashMap origin=GET_PROPERTY key: CALL 'public final fun (): java.lang.Class.PlatformExtensionsClashResolver> declared in .PlatformExtensionsClashResolver' type=java.lang.Class.PlatformSpecificExtension<*>> origin=GET_PROPERTY $this: GET_VAR 'val resolver: .PlatformExtensionsClashResolver<*> declared in .resolveClashesIfAny' type=.PlatformExtensionsClashResolver<*> origin=null WHEN type=kotlin.collections.Collection<.ComponentDescriptor> origin=null diff --git a/compiler/testData/ir/irText/firProblems/SignatureClash.ir.txt b/compiler/testData/ir/irText/firProblems/SignatureClash.ir.txt index d095ede5849..bb4e83f43ce 100644 --- a/compiler/testData/ir/irText/firProblems/SignatureClash.ir.txt +++ b/compiler/testData/ir/irText/firProblems/SignatureClash.ir.txt @@ -12,12 +12,12 @@ FILE fqName: fileName:/SignatureClash.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun foo (a: kotlin.String): kotlin.String declared in .Factory' CONST String type=kotlin.String value="Alpha" - FUN name:foo visibility:public modality:FINAL <> ($this:.Factory, a:kotlin.String, f:kotlin.Function1{ .Some }) returnType:kotlin.String + FUN name:foo visibility:public modality:FINAL <> ($this:.Factory, a:kotlin.String, f:kotlin.Function1) returnType:kotlin.String $this: VALUE_PARAMETER name: type:.Factory VALUE_PARAMETER name:a index:0 type:kotlin.String - VALUE_PARAMETER name:f index:1 type:kotlin.Function1{ .Some } + VALUE_PARAMETER name:f index:1 type:kotlin.Function1 BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun foo (a: kotlin.String, f: kotlin.Function1{ .Some }): kotlin.String declared in .Factory' + RETURN type=kotlin.Nothing from='public final fun foo (a: kotlin.String, f: kotlin.Function1): kotlin.String declared in .Factory' CONST String type=kotlin.String value="Omega" FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: diff --git a/compiler/testData/ir/irText/firProblems/TypeAliasConstructorParameterMapping.ir.txt b/compiler/testData/ir/irText/firProblems/TypeAliasConstructorParameterMapping.ir.txt index d3dc177e984..c1c7a61b3f4 100644 --- a/compiler/testData/ir/irText/firProblems/TypeAliasConstructorParameterMapping.ir.txt +++ b/compiler/testData/ir/irText/firProblems/TypeAliasConstructorParameterMapping.ir.txt @@ -62,87 +62,87 @@ FILE fqName: fileName:/TypeAliasConstructorParameterMapping.kt TYPE_PARAMETER name:A index:0 variance: superTypes:[kotlin.Any?] reified:false TYPE_PARAMETER name:B index:1 variance: superTypes:[kotlin.Any?] reified:false PROPERTY name:test1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test1 type:.Box1{ .OneToOne } visibility:private [final,static] + FIELD PROPERTY_BACKING_FIELD name:test1 type:.Box1 visibility:private [final,static] EXPRESSION_BODY CONSTRUCTOR_CALL 'public constructor () declared in .Box1' type=.Box1 origin=null : kotlin.Int - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:.Box1{ .OneToOne } + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:.Box1 correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): .Box1{ .OneToOne } declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:.Box1{ .OneToOne } visibility:private [final,static]' type=.Box1{ .OneToOne } origin=null + RETURN type=kotlin.Nothing from='public final fun (): .Box1 declared in ' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:.Box1 visibility:private [final,static]' type=.Box1 origin=null PROPERTY name:test2 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test2 type:.Box2{ .OneToTwo } visibility:private [final,static] + FIELD PROPERTY_BACKING_FIELD name:test2 type:.Box2 visibility:private [final,static] EXPRESSION_BODY CONSTRUCTOR_CALL 'public constructor () declared in .Box2' type=.Box2 origin=null : kotlin.Int : kotlin.Int - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:.Box2{ .OneToTwo } + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:.Box2 correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): .Box2{ .OneToTwo } declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:.Box2{ .OneToTwo } visibility:private [final,static]' type=.Box2{ .OneToTwo } origin=null + RETURN type=kotlin.Nothing from='public final fun (): .Box2 declared in ' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:.Box2 visibility:private [final,static]' type=.Box2 origin=null PROPERTY name:test3 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test3 type:.Box2{ .TwoToTwo } visibility:private [final,static] + FIELD PROPERTY_BACKING_FIELD name:test3 type:.Box2 visibility:private [final,static] EXPRESSION_BODY CONSTRUCTOR_CALL 'public constructor () declared in .Box2' type=.Box2 origin=null : kotlin.Int : kotlin.String - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:.Box2{ .TwoToTwo } + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:.Box2 correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [val] BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): .Box2{ .TwoToTwo } declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:.Box2{ .TwoToTwo } visibility:private [final,static]' type=.Box2{ .TwoToTwo } origin=null + RETURN type=kotlin.Nothing from='public final fun (): .Box2 declared in ' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:.Box2 visibility:private [final,static]' type=.Box2 origin=null PROPERTY name:test4 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test4 type:.Box2{ .TwoToTwoReversed } visibility:private [final,static] + FIELD PROPERTY_BACKING_FIELD name:test4 type:.Box2 visibility:private [final,static] EXPRESSION_BODY CONSTRUCTOR_CALL 'public constructor () declared in .Box2' type=.Box2 origin=null : kotlin.String : kotlin.Int - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:.Box2{ .TwoToTwoReversed } + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:.Box2 correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [val] BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): .Box2{ .TwoToTwoReversed } declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:.Box2{ .TwoToTwoReversed } visibility:private [final,static]' type=.Box2{ .TwoToTwoReversed } origin=null + RETURN type=kotlin.Nothing from='public final fun (): .Box2 declared in ' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:.Box2 visibility:private [final,static]' type=.Box2 origin=null PROPERTY name:test5 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test5 type:.Box1{ .TwoToOne } visibility:private [final,static] + FIELD PROPERTY_BACKING_FIELD name:test5 type:.Box1 visibility:private [final,static] EXPRESSION_BODY CONSTRUCTOR_CALL 'public constructor () declared in .Box1' type=.Box1 origin=null : kotlin.Int - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:.Box1{ .TwoToOne } + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:.Box1 correspondingProperty: PROPERTY name:test5 visibility:public modality:FINAL [val] BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): .Box1{ .TwoToOne } declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test5 type:.Box1{ .TwoToOne } visibility:private [final,static]' type=.Box1{ .TwoToOne } origin=null + RETURN type=kotlin.Nothing from='public final fun (): .Box1 declared in ' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test5 type:.Box1 visibility:private [final,static]' type=.Box1 origin=null PROPERTY name:test6 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test6 type:.Box1{ .OneToOneTransitive } visibility:private [final,static] + FIELD PROPERTY_BACKING_FIELD name:test6 type:.Box1 visibility:private [final,static] EXPRESSION_BODY CONSTRUCTOR_CALL 'public constructor () declared in .Box1' type=.Box1 origin=null : kotlin.Int - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:.Box1{ .OneToOneTransitive } + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:.Box1 correspondingProperty: PROPERTY name:test6 visibility:public modality:FINAL [val] BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): .Box1{ .OneToOneTransitive } declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test6 type:.Box1{ .OneToOneTransitive } visibility:private [final,static]' type=.Box1{ .OneToOneTransitive } origin=null + RETURN type=kotlin.Nothing from='public final fun (): .Box1 declared in ' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test6 type:.Box1 visibility:private [final,static]' type=.Box1 origin=null PROPERTY name:test7 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test7 type:.Box2{ .TwoToTwoTransitive } visibility:private [final,static] + FIELD PROPERTY_BACKING_FIELD name:test7 type:.Box2 visibility:private [final,static] EXPRESSION_BODY CONSTRUCTOR_CALL 'public constructor () declared in .Box2' type=.Box2 origin=null : kotlin.Int : kotlin.Int - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:.Box2{ .TwoToTwoTransitive } + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:.Box2 correspondingProperty: PROPERTY name:test7 visibility:public modality:FINAL [val] BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): .Box2{ .TwoToTwoTransitive } declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test7 type:.Box2{ .TwoToTwoTransitive } visibility:private [final,static]' type=.Box2{ .TwoToTwoTransitive } origin=null + RETURN type=kotlin.Nothing from='public final fun (): .Box2 declared in ' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test7 type:.Box2 visibility:private [final,static]' type=.Box2 origin=null PROPERTY name:test8 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test8 type:.Box2{ .TwoToTwoTransitive2 } visibility:private [final,static] + FIELD PROPERTY_BACKING_FIELD name:test8 type:.Box2 visibility:private [final,static] EXPRESSION_BODY CONSTRUCTOR_CALL 'public constructor () declared in .Box2' type=.Box2 origin=null : kotlin.String : kotlin.String - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:.Box2{ .TwoToTwoTransitive2 } + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:.Box2 correspondingProperty: PROPERTY name:test8 visibility:public modality:FINAL [val] BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): .Box2{ .TwoToTwoTransitive2 } declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test8 type:.Box2{ .TwoToTwoTransitive2 } visibility:private [final,static]' type=.Box2{ .TwoToTwoTransitive2 } origin=null + RETURN type=kotlin.Nothing from='public final fun (): .Box2 declared in ' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test8 type:.Box2 visibility:private [final,static]' type=.Box2 origin=null diff --git a/compiler/testData/ir/irText/firProblems/coercionToUnitForNestedWhen.ir.txt b/compiler/testData/ir/irText/firProblems/coercionToUnitForNestedWhen.ir.txt index 6c082b3b0c5..6697a91cb9a 100644 --- a/compiler/testData/ir/irText/firProblems/coercionToUnitForNestedWhen.ir.txt +++ b/compiler/testData/ir/irText/firProblems/coercionToUnitForNestedWhen.ir.txt @@ -36,9 +36,9 @@ FILE fqName: fileName:/coercionToUnitForNestedWhen.kt if: CONST Boolean type=kotlin.Boolean value=true then: CALL 'public open fun toChar (): kotlin.Char declared in kotlin.Int' type=kotlin.Char origin=null $this: GET_VAR 'val tmp_0: kotlin.Int? declared in .nextChar' type=kotlin.Int? origin=null - FUN name:consumeRestOfQuotedSequence visibility:public modality:FINAL <> ($receiver:java.io.Reader, sb:java.lang.StringBuilder{ kotlin.text.StringBuilder }, quote:kotlin.Char) returnType:kotlin.Unit + FUN name:consumeRestOfQuotedSequence visibility:public modality:FINAL <> ($receiver:java.io.Reader, sb:java.lang.StringBuilder, quote:kotlin.Char) returnType:kotlin.Unit $receiver: VALUE_PARAMETER name: type:java.io.Reader - VALUE_PARAMETER name:sb index:0 type:java.lang.StringBuilder{ kotlin.text.StringBuilder } + VALUE_PARAMETER name:sb index:0 type:java.lang.StringBuilder VALUE_PARAMETER name:quote index:1 type:kotlin.Char BLOCK_BODY VAR name:ch type:kotlin.Char? [var] @@ -87,13 +87,13 @@ FILE fqName: fileName:/coercionToUnitForNestedWhen.kt BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (it: kotlin.Char): @[FlexibleNullability] java.lang.StringBuilder? declared in .consumeRestOfQuotedSequence' CALL 'public open fun append (p0: kotlin.Char): @[FlexibleNullability] java.lang.StringBuilder? declared in java.lang.StringBuilder' type=@[FlexibleNullability] java.lang.StringBuilder? origin=null - $this: GET_VAR 'sb: java.lang.StringBuilder{ kotlin.text.StringBuilder } declared in .consumeRestOfQuotedSequence' type=java.lang.StringBuilder{ kotlin.text.StringBuilder } origin=null + $this: GET_VAR 'sb: java.lang.StringBuilder declared in .consumeRestOfQuotedSequence' type=java.lang.StringBuilder origin=null p0: GET_VAR 'it: kotlin.Char declared in .consumeRestOfQuotedSequence.' type=kotlin.Char origin=null BRANCH if: CONST Boolean type=kotlin.Boolean value=true then: TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit CALL 'public open fun append (p0: kotlin.Char): @[FlexibleNullability] java.lang.StringBuilder? declared in java.lang.StringBuilder' type=@[FlexibleNullability] java.lang.StringBuilder? origin=null - $this: GET_VAR 'sb: java.lang.StringBuilder{ kotlin.text.StringBuilder } declared in .consumeRestOfQuotedSequence' type=java.lang.StringBuilder{ kotlin.text.StringBuilder } origin=null + $this: GET_VAR 'sb: java.lang.StringBuilder declared in .consumeRestOfQuotedSequence' type=java.lang.StringBuilder origin=null p0: GET_VAR 'var ch: kotlin.Char? declared in .consumeRestOfQuotedSequence' type=kotlin.Char? origin=null SET_VAR 'var ch: kotlin.Char? declared in .consumeRestOfQuotedSequence' type=kotlin.Unit origin=EQ CALL 'private final fun nextChar (): kotlin.Char? declared in ' type=kotlin.Char? origin=null diff --git a/compiler/testData/ir/irText/firProblems/integerLiteralWithExpectedTypealiasType.fir.ir.txt b/compiler/testData/ir/irText/firProblems/integerLiteralWithExpectedTypealiasType.fir.ir.txt deleted file mode 100644 index 57af48119e7..00000000000 --- a/compiler/testData/ir/irText/firProblems/integerLiteralWithExpectedTypealiasType.fir.ir.txt +++ /dev/null @@ -1,20 +0,0 @@ -FILE fqName: fileName:/integerLiteralWithExpectedTypealiasType.kt - TYPEALIAS name:MyLong visibility:public expandedType:kotlin.Long - FUN name:foo visibility:public modality:FINAL <> (l:kotlin.Long) returnType:kotlin.String - VALUE_PARAMETER name:l index:0 type:kotlin.Long - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun foo (l: kotlin.Long): kotlin.String declared in ' - WHEN type=kotlin.String origin=IF - BRANCH - if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ - arg0: GET_VAR 'l: kotlin.Long declared in .foo' type=kotlin.Long origin=null - arg1: CONST Long type=kotlin.Long value=0 - then: CONST String type=kotlin.String value="OK" - BRANCH - if: CONST Boolean type=kotlin.Boolean value=true - then: CONST String type=kotlin.String value="fail" - 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 foo (l: kotlin.Long): kotlin.String declared in ' type=kotlin.String origin=null - l: CONST Long type=kotlin.Long value=0 diff --git a/compiler/testData/ir/irText/firProblems/integerLiteralWithExpectedTypealiasType.fir.kt.txt b/compiler/testData/ir/irText/firProblems/integerLiteralWithExpectedTypealiasType.fir.kt.txt deleted file mode 100644 index cba78f4a034..00000000000 --- a/compiler/testData/ir/irText/firProblems/integerLiteralWithExpectedTypealiasType.fir.kt.txt +++ /dev/null @@ -1,11 +0,0 @@ -typealias MyLong = Long -fun foo(l: Long): String { - return when { - EQEQ(arg0 = l, arg1 = 0L) -> "OK" - else -> "fail" - } -} - -fun box(): String { - return foo(l = 0L) -} diff --git a/compiler/testData/ir/irText/firProblems/integerLiteralWithExpectedTypealiasType.ir.txt b/compiler/testData/ir/irText/firProblems/integerLiteralWithExpectedTypealiasType.ir.txt index 12d8a7a90c8..57af48119e7 100644 --- a/compiler/testData/ir/irText/firProblems/integerLiteralWithExpectedTypealiasType.ir.txt +++ b/compiler/testData/ir/irText/firProblems/integerLiteralWithExpectedTypealiasType.ir.txt @@ -1,13 +1,13 @@ FILE fqName: fileName:/integerLiteralWithExpectedTypealiasType.kt TYPEALIAS name:MyLong visibility:public expandedType:kotlin.Long - FUN name:foo visibility:public modality:FINAL <> (l:kotlin.Long{ .MyLong }) returnType:kotlin.String - VALUE_PARAMETER name:l index:0 type:kotlin.Long{ .MyLong } + FUN name:foo visibility:public modality:FINAL <> (l:kotlin.Long) returnType:kotlin.String + VALUE_PARAMETER name:l index:0 type:kotlin.Long BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun foo (l: kotlin.Long{ .MyLong }): kotlin.String declared in ' + RETURN type=kotlin.Nothing from='public final fun foo (l: kotlin.Long): kotlin.String declared in ' WHEN type=kotlin.String origin=IF BRANCH if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ - arg0: GET_VAR 'l: kotlin.Long{ .MyLong } declared in .foo' type=kotlin.Long{ .MyLong } origin=null + arg0: GET_VAR 'l: kotlin.Long declared in .foo' type=kotlin.Long origin=null arg1: CONST Long type=kotlin.Long value=0 then: CONST String type=kotlin.String value="OK" BRANCH @@ -16,5 +16,5 @@ FILE fqName: fileName:/integerLiteralWithExpectedTypealiasType.kt 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 foo (l: kotlin.Long{ .MyLong }): kotlin.String declared in ' type=kotlin.String origin=null + CALL 'public final fun foo (l: kotlin.Long): kotlin.String declared in ' type=kotlin.String origin=null l: CONST Long type=kotlin.Long value=0 diff --git a/compiler/testData/ir/irText/firProblems/integerLiteralWithExpectedTypealiasType.kt b/compiler/testData/ir/irText/firProblems/integerLiteralWithExpectedTypealiasType.kt index 98c230c7b71..4a32024cf6f 100644 --- a/compiler/testData/ir/irText/firProblems/integerLiteralWithExpectedTypealiasType.kt +++ b/compiler/testData/ir/irText/firProblems/integerLiteralWithExpectedTypealiasType.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // ISSUE: KT-56176 typealias MyLong = Long diff --git a/compiler/testData/ir/irText/firProblems/reflectGetOnNullableTypeAlias.ir.txt b/compiler/testData/ir/irText/firProblems/reflectGetOnNullableTypeAlias.ir.txt index e191f15cf82..9bbdb1031bd 100644 --- a/compiler/testData/ir/irText/firProblems/reflectGetOnNullableTypeAlias.ir.txt +++ b/compiler/testData/ir/irText/firProblems/reflectGetOnNullableTypeAlias.ir.txt @@ -3,19 +3,19 @@ FILE fqName: fileName:/reflectGetOnNullableTypeAlias.kt TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String BLOCK_BODY - VAR name:backRefProp type:kotlin.reflect.KProperty1<.Foo, kotlin.Any?>?{ .PropAlias<.Foo> } [val] + VAR name:backRefProp type:kotlin.reflect.KProperty1<.Foo, kotlin.Any?>? [val] PROPERTY_REFERENCE 'public final bar: kotlin.String' field=null getter='public final fun (): kotlin.String declared in .Foo' setter=null type=kotlin.reflect.KProperty1<.Foo, kotlin.String> origin=null WHEN type=kotlin.Unit origin=IF BRANCH if: CALL 'public final fun not (): kotlin.Boolean declared in kotlin.Boolean' type=kotlin.Boolean origin=EXCLEQ $this: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EXCLEQ - arg0: GET_VAR 'val backRefProp: kotlin.reflect.KProperty1<.Foo, kotlin.Any?>?{ .PropAlias<.Foo> } declared in .box' type=kotlin.reflect.KProperty1<.Foo, kotlin.Any?>?{ .PropAlias<.Foo> } origin=null + arg0: GET_VAR 'val backRefProp: kotlin.reflect.KProperty1<.Foo, kotlin.Any?>? declared in .box' type=kotlin.reflect.KProperty1<.Foo, kotlin.Any?>? origin=null arg1: CONST Null type=kotlin.Nothing? value=null then: BLOCK type=kotlin.Unit origin=null RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in ' TYPE_OP type=kotlin.String origin=CAST typeOperand=kotlin.String CALL 'public abstract fun get (receiver: T of kotlin.reflect.KProperty1): V of kotlin.reflect.KProperty1 declared in kotlin.reflect.KProperty1' type=kotlin.Any? origin=null - $this: GET_VAR 'val backRefProp: kotlin.reflect.KProperty1<.Foo, kotlin.Any?>?{ .PropAlias<.Foo> } declared in .box' type=kotlin.reflect.KProperty1<.Foo, kotlin.Any?>?{ .PropAlias<.Foo> } origin=null + $this: GET_VAR 'val backRefProp: kotlin.reflect.KProperty1<.Foo, kotlin.Any?>? declared in .box' type=kotlin.reflect.KProperty1<.Foo, kotlin.Any?>? origin=null receiver: CONSTRUCTOR_CALL 'public constructor () declared in .Foo' type=.Foo origin=null RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in ' CONST String type=kotlin.String value="FAIL" diff --git a/compiler/testData/ir/irText/regressions/integerCoercionToT.ir.txt b/compiler/testData/ir/irText/regressions/integerCoercionToT.ir.txt index 72abb14c162..bbe5eb2bee9 100644 --- a/compiler/testData/ir/irText/regressions/integerCoercionToT.ir.txt +++ b/compiler/testData/ir/irText/regressions/integerCoercionToT.ir.txt @@ -86,12 +86,12 @@ FILE fqName: fileName:/integerCoercionToT.kt overridden: public open fun toString (): kotlin.String declared in .CPointed $this: VALUE_PARAMETER name: type:kotlin.Any - FUN name:foo visibility:public modality:FINAL <> (value:.IdType, cv:.CInt32VarX{ .CInt32Var }) returnType:kotlin.Unit + FUN name:foo visibility:public modality:FINAL <> (value:.IdType, cv:.CInt32VarX) returnType:kotlin.Unit VALUE_PARAMETER name:value index:0 type:.IdType - VALUE_PARAMETER name:cv index:1 type:.CInt32VarX{ .CInt32Var } + VALUE_PARAMETER name:cv index:1 type:.CInt32VarX BLOCK_BODY CALL 'public final fun (value: T_INT of .): kotlin.Unit declared in ' type=kotlin.Unit origin=EQ : kotlin.Int - $receiver: GET_VAR 'cv: .CInt32VarX{ .CInt32Var } declared in .foo' type=.CInt32VarX{ .CInt32Var } origin=null + $receiver: GET_VAR 'cv: .CInt32VarX declared in .foo' type=.CInt32VarX origin=null value: CALL 'public final fun (): kotlin.Int declared in .IdType' type=kotlin.Int origin=GET_PROPERTY $this: GET_VAR 'value: .IdType declared in .foo' type=.IdType origin=null diff --git a/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.ir.txt b/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.ir.txt index 9d0d95eba7e..34bc6dfb8d4 100644 --- a/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.ir.txt +++ b/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.ir.txt @@ -37,11 +37,11 @@ FILE fqName: fileName:/typeAliasCtorForGenericClass.kt TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false FUN name:bar visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY - VAR name:b type:.A{ .B } [val] + VAR name:b type:.A [val] CONSTRUCTOR_CALL 'public constructor (q: Q of .A) declared in .A' type=.A origin=null : kotlin.Int q: CONST Int type=kotlin.Int value=2 - VAR name:b2 type:.A<.A>{ .B2 } [val] + VAR name:b2 type:.A<.A> [val] CONSTRUCTOR_CALL 'public constructor (q: Q of .A) declared in .A' type=.A<.A> origin=null : .A - q: GET_VAR 'val b: .A{ .B } declared in .bar' type=.A{ .B } origin=null + q: GET_VAR 'val b: .A declared in .bar' type=.A origin=null diff --git a/compiler/testData/ir/irText/stubs/builtinMap.ir.txt b/compiler/testData/ir/irText/stubs/builtinMap.ir.txt index 0f4bb09b5d5..bea06ded418 100644 --- a/compiler/testData/ir/irText/stubs/builtinMap.ir.txt +++ b/compiler/testData/ir/irText/stubs/builtinMap.ir.txt @@ -16,19 +16,19 @@ FILE fqName: fileName:/builtinMap.kt pair: GET_VAR 'pair: kotlin.Pair.plus, V1 of .plus> declared in .plus' type=kotlin.Pair.plus, V1 of .plus> origin=null BRANCH if: CONST Boolean type=kotlin.Boolean value=true - then: CALL 'public final fun apply (block: @[ExtensionFunctionType] kotlin.Function1): T of kotlin.apply declared in kotlin' type=java.util.LinkedHashMap<@[FlexibleNullability] K1 of .plus?, @[FlexibleNullability] V1 of .plus?>{ kotlin.collections.LinkedHashMap<@[FlexibleNullability] K1 of .plus?, @[FlexibleNullability] V1 of .plus?> } origin=null - : java.util.LinkedHashMap<@[FlexibleNullability] K1 of .plus?, @[FlexibleNullability] V1 of .plus?>{ kotlin.collections.LinkedHashMap<@[FlexibleNullability] K1 of .plus?, @[FlexibleNullability] V1 of .plus?> } + then: CALL 'public final fun apply (block: @[ExtensionFunctionType] kotlin.Function1): T of kotlin.apply declared in kotlin' type=java.util.LinkedHashMap<@[FlexibleNullability] K1 of .plus?, @[FlexibleNullability] V1 of .plus?> origin=null + : java.util.LinkedHashMap<@[FlexibleNullability] K1 of .plus?, @[FlexibleNullability] V1 of .plus?> $receiver: CONSTRUCTOR_CALL 'public constructor (p0: @[FlexibleNullability] @[FlexibleMutability] kotlin.collections.MutableMap?) declared in java.util.LinkedHashMap' type=java.util.LinkedHashMap<@[FlexibleNullability] K1 of .plus?, @[FlexibleNullability] V1 of .plus?> origin=null : @[FlexibleNullability] K1 of .plus? : @[FlexibleNullability] V1 of .plus? p0: GET_VAR ': kotlin.collections.Map.plus, V1 of .plus> declared in .plus' type=kotlin.collections.Map.plus, V1 of .plus> origin=null - block: FUN_EXPR type=@[ExtensionFunctionType] kotlin.Function1.plus?, @[FlexibleNullability] V1 of .plus?>{ kotlin.collections.LinkedHashMap<@[FlexibleNullability] K1 of .plus?, @[FlexibleNullability] V1 of .plus?> }, kotlin.Unit> origin=LAMBDA - FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> ($receiver:java.util.LinkedHashMap<@[FlexibleNullability] K1 of .plus?, @[FlexibleNullability] V1 of .plus?>{ kotlin.collections.LinkedHashMap<@[FlexibleNullability] K1 of .plus?, @[FlexibleNullability] V1 of .plus?> }) returnType:kotlin.Unit - $receiver: VALUE_PARAMETER name:$this$apply type:java.util.LinkedHashMap<@[FlexibleNullability] K1 of .plus?, @[FlexibleNullability] V1 of .plus?>{ kotlin.collections.LinkedHashMap<@[FlexibleNullability] K1 of .plus?, @[FlexibleNullability] V1 of .plus?> } + block: FUN_EXPR type=@[ExtensionFunctionType] kotlin.Function1.plus?, @[FlexibleNullability] V1 of .plus?>, kotlin.Unit> origin=LAMBDA + FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> ($receiver:java.util.LinkedHashMap<@[FlexibleNullability] K1 of .plus?, @[FlexibleNullability] V1 of .plus?>) returnType:kotlin.Unit + $receiver: VALUE_PARAMETER name:$this$apply type:java.util.LinkedHashMap<@[FlexibleNullability] K1 of .plus?, @[FlexibleNullability] V1 of .plus?> BLOCK_BODY TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit CALL 'public open fun put (key: @[EnhancedNullability] K of java.util.LinkedHashMap, value: @[EnhancedNullability] V of java.util.LinkedHashMap): @[EnhancedNullability] V of java.util.LinkedHashMap? declared in java.util.LinkedHashMap' type=@[EnhancedNullability] V1 of .plus? origin=null - $this: GET_VAR '$this$apply: java.util.LinkedHashMap<@[FlexibleNullability] K1 of .plus?, @[FlexibleNullability] V1 of .plus?>{ kotlin.collections.LinkedHashMap<@[FlexibleNullability] K1 of .plus?, @[FlexibleNullability] V1 of .plus?> } declared in .plus.' type=java.util.LinkedHashMap<@[FlexibleNullability] K1 of .plus?, @[FlexibleNullability] V1 of .plus?>{ kotlin.collections.LinkedHashMap<@[FlexibleNullability] K1 of .plus?, @[FlexibleNullability] V1 of .plus?> } origin=null + $this: GET_VAR '$this$apply: java.util.LinkedHashMap<@[FlexibleNullability] K1 of .plus?, @[FlexibleNullability] V1 of .plus?> declared in .plus.' type=java.util.LinkedHashMap<@[FlexibleNullability] K1 of .plus?, @[FlexibleNullability] V1 of .plus?> origin=null key: CALL 'public final fun (): A of kotlin.Pair declared in kotlin.Pair' type=K1 of .plus origin=GET_PROPERTY $this: GET_VAR 'pair: kotlin.Pair.plus, V1 of .plus> declared in .plus' type=kotlin.Pair.plus, V1 of .plus> origin=null value: CALL 'public final fun (): B of kotlin.Pair declared in kotlin.Pair' type=V1 of .plus origin=GET_PROPERTY diff --git a/compiler/testData/ir/irText/types/abbreviatedTypes.fir.ir.txt b/compiler/testData/ir/irText/types/abbreviatedTypes.fir.ir.txt deleted file mode 100644 index 8bb3290b60d..00000000000 --- a/compiler/testData/ir/irText/types/abbreviatedTypes.fir.ir.txt +++ /dev/null @@ -1,24 +0,0 @@ -FILE fqName: fileName:/abbreviatedTypes.kt - TYPEALIAS name:I visibility:public expandedType:kotlin.Int - TYPEALIAS name:L visibility:public expandedType:kotlin.collections.List.L> - TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false - FUN name:test1 visibility:public modality:FINAL <> (x:kotlin.collections.List) returnType:kotlin.collections.List - VALUE_PARAMETER name:x index:0 type:kotlin.collections.List - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test1 (x: kotlin.collections.List): kotlin.collections.List declared in ' - GET_VAR 'x: kotlin.collections.List declared in .test1' type=kotlin.collections.List origin=null - FUN name:test2 visibility:public modality:FINAL <> (x:kotlin.collections.List>) returnType:kotlin.collections.List> - VALUE_PARAMETER name:x index:0 type:kotlin.collections.List> - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test2 (x: kotlin.collections.List>): kotlin.collections.List> declared in ' - GET_VAR 'x: kotlin.collections.List> declared in .test2' type=kotlin.collections.List> origin=null - FUN name:test3 visibility:public modality:FINAL <> (x:kotlin.collections.List>) returnType:kotlin.collections.List> - VALUE_PARAMETER name:x index:0 type:kotlin.collections.List> - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test3 (x: kotlin.collections.List>): kotlin.collections.List> declared in ' - GET_VAR 'x: kotlin.collections.List> declared in .test3' type=kotlin.collections.List> origin=null - FUN name:test4 visibility:public modality:FINAL <> (x:kotlin.collections.List>) returnType:kotlin.collections.List> - VALUE_PARAMETER name:x index:0 type:kotlin.collections.List> - BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test4 (x: kotlin.collections.List>): kotlin.collections.List> declared in ' - GET_VAR 'x: kotlin.collections.List> declared in .test4' type=kotlin.collections.List> origin=null diff --git a/compiler/testData/ir/irText/types/abbreviatedTypes.fir.kt.txt b/compiler/testData/ir/irText/types/abbreviatedTypes.fir.kt.txt deleted file mode 100644 index 4a01af01494..00000000000 --- a/compiler/testData/ir/irText/types/abbreviatedTypes.fir.kt.txt +++ /dev/null @@ -1,17 +0,0 @@ -typealias I = Int -typealias L = List -fun test1(x: List): List { - return x -} - -fun test2(x: List>): List> { - return x -} - -fun test3(x: List>): List> { - return x -} - -fun test4(x: List>): List> { - return x -} diff --git a/compiler/testData/ir/irText/types/abbreviatedTypes.ir.txt b/compiler/testData/ir/irText/types/abbreviatedTypes.ir.txt index 558212f0134..8bb3290b60d 100644 --- a/compiler/testData/ir/irText/types/abbreviatedTypes.ir.txt +++ b/compiler/testData/ir/irText/types/abbreviatedTypes.ir.txt @@ -2,23 +2,23 @@ FILE fqName: fileName:/abbreviatedTypes.kt TYPEALIAS name:I visibility:public expandedType:kotlin.Int TYPEALIAS name:L visibility:public expandedType:kotlin.collections.List.L> TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any?] reified:false - FUN name:test1 visibility:public modality:FINAL <> (x:kotlin.collections.List.I }>{ .L.I }> }) returnType:kotlin.collections.List.I }>{ .L.I }> } - VALUE_PARAMETER name:x index:0 type:kotlin.collections.List.I }>{ .L.I }> } + FUN name:test1 visibility:public modality:FINAL <> (x:kotlin.collections.List) returnType:kotlin.collections.List + VALUE_PARAMETER name:x index:0 type:kotlin.collections.List BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test1 (x: kotlin.collections.List.I }>{ .L.I }> }): kotlin.collections.List.I }>{ .L.I }> } declared in ' - GET_VAR 'x: kotlin.collections.List.I }>{ .L.I }> } declared in .test1' type=kotlin.collections.List.I }>{ .L.I }> } origin=null - FUN name:test2 visibility:public modality:FINAL <> (x:kotlin.collections.List.I }>{ .L.I }> }>) returnType:kotlin.collections.List.I }>{ .L.I }> }> - VALUE_PARAMETER name:x index:0 type:kotlin.collections.List.I }>{ .L.I }> }> + RETURN type=kotlin.Nothing from='public final fun test1 (x: kotlin.collections.List): kotlin.collections.List declared in ' + GET_VAR 'x: kotlin.collections.List declared in .test1' type=kotlin.collections.List origin=null + FUN name:test2 visibility:public modality:FINAL <> (x:kotlin.collections.List>) returnType:kotlin.collections.List> + VALUE_PARAMETER name:x index:0 type:kotlin.collections.List> BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test2 (x: kotlin.collections.List.I }>{ .L.I }> }>): kotlin.collections.List.I }>{ .L.I }> }> declared in ' - GET_VAR 'x: kotlin.collections.List.I }>{ .L.I }> }> declared in .test2' type=kotlin.collections.List.I }>{ .L.I }> }> origin=null - FUN name:test3 visibility:public modality:FINAL <> (x:kotlin.collections.List.I }>>{ .L.I }>> }) returnType:kotlin.collections.List.I }>>{ .L.I }>> } - VALUE_PARAMETER name:x index:0 type:kotlin.collections.List.I }>>{ .L.I }>> } + RETURN type=kotlin.Nothing from='public final fun test2 (x: kotlin.collections.List>): kotlin.collections.List> declared in ' + GET_VAR 'x: kotlin.collections.List> declared in .test2' type=kotlin.collections.List> origin=null + FUN name:test3 visibility:public modality:FINAL <> (x:kotlin.collections.List>) returnType:kotlin.collections.List> + VALUE_PARAMETER name:x index:0 type:kotlin.collections.List> BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test3 (x: kotlin.collections.List.I }>>{ .L.I }>> }): kotlin.collections.List.I }>>{ .L.I }>> } declared in ' - GET_VAR 'x: kotlin.collections.List.I }>>{ .L.I }>> } declared in .test3' type=kotlin.collections.List.I }>>{ .L.I }>> } origin=null - FUN name:test4 visibility:public modality:FINAL <> (x:kotlin.collections.List.I }>>{ .L.I }>{ .L.I }> }> }) returnType:kotlin.collections.List.I }>>{ .L.I }>{ .L.I }> }> } - VALUE_PARAMETER name:x index:0 type:kotlin.collections.List.I }>>{ .L.I }>{ .L.I }> }> } + RETURN type=kotlin.Nothing from='public final fun test3 (x: kotlin.collections.List>): kotlin.collections.List> declared in ' + GET_VAR 'x: kotlin.collections.List> declared in .test3' type=kotlin.collections.List> origin=null + FUN name:test4 visibility:public modality:FINAL <> (x:kotlin.collections.List>) returnType:kotlin.collections.List> + VALUE_PARAMETER name:x index:0 type:kotlin.collections.List> BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun test4 (x: kotlin.collections.List.I }>>{ .L.I }>{ .L.I }> }> }): kotlin.collections.List.I }>>{ .L.I }>{ .L.I }> }> } declared in ' - GET_VAR 'x: kotlin.collections.List.I }>>{ .L.I }>{ .L.I }> }> } declared in .test4' type=kotlin.collections.List.I }>>{ .L.I }>{ .L.I }> }> } origin=null + RETURN type=kotlin.Nothing from='public final fun test4 (x: kotlin.collections.List>): kotlin.collections.List> declared in ' + GET_VAR 'x: kotlin.collections.List> declared in .test4' type=kotlin.collections.List> origin=null diff --git a/compiler/testData/ir/irText/types/abbreviatedTypes.kt b/compiler/testData/ir/irText/types/abbreviatedTypes.kt index 4ce8c470538..73749496474 100644 --- a/compiler/testData/ir/irText/types/abbreviatedTypes.kt +++ b/compiler/testData/ir/irText/types/abbreviatedTypes.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL typealias I = Int typealias L = List diff --git a/compiler/testData/ir/irText/types/typeAliasWithUnsafeVariance.ir.txt b/compiler/testData/ir/irText/types/typeAliasWithUnsafeVariance.ir.txt index f690eded4fe..218649c51f8 100644 --- a/compiler/testData/ir/irText/types/typeAliasWithUnsafeVariance.ir.txt +++ b/compiler/testData/ir/irText/types/typeAliasWithUnsafeVariance.ir.txt @@ -4,39 +4,39 @@ FILE fqName: fileName:/typeAliasWithUnsafeVariance.kt CLASS CLASS name:Tag modality:FINAL visibility:public [data] superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Tag.Tag> TYPE_PARAMETER name:RenderingT index:0 variance:out superTypes:[kotlin.Any?] reified:false - CONSTRUCTOR visibility:public <> (action:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> }) returnType:.Tag.Tag> [primary] - VALUE_PARAMETER name:action index:0 type:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> } + CONSTRUCTOR visibility:public <> (action:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>) returnType:.Tag.Tag> [primary] + VALUE_PARAMETER name:action index:0 type:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit> BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in kotlin.Any' INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Tag modality:FINAL visibility:public [data] superTypes:[kotlin.Any]' PROPERTY name:action visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:action type:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> } visibility:private [final] + FIELD PROPERTY_BACKING_FIELD name:action type:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit> visibility:private [final] EXPRESSION_BODY - GET_VAR 'action: kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> } declared in .Tag.' type=kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> } origin=INITIALIZE_PROPERTY_FROM_PARAMETER - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Tag.Tag>) returnType:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> } + GET_VAR 'action: kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit> declared in .Tag.' type=kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit> origin=INITIALIZE_PROPERTY_FROM_PARAMETER + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.Tag.Tag>) returnType:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit> correspondingProperty: PROPERTY name:action visibility:public modality:FINAL [val] $this: VALUE_PARAMETER name: type:.Tag.Tag> BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> } declared in .Tag' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:action type:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> } visibility:private [final]' type=kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> } origin=null + RETURN type=kotlin.Nothing from='public final fun (): kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit> declared in .Tag' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:action type:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit> visibility:private [final]' type=kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit> origin=null receiver: GET_VAR ': .Tag.Tag> declared in .Tag.' type=.Tag.Tag> origin=null - FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:.Tag.Tag>) returnType:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> } [operator] + FUN GENERATED_DATA_CLASS_MEMBER name:component1 visibility:public modality:FINAL <> ($this:.Tag.Tag>) returnType:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit> [operator] $this: VALUE_PARAMETER name: type:.Tag.Tag> BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> } declared in .Tag' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:action type:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> } visibility:private [final]' type=kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> } origin=null + RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit> declared in .Tag' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:action type:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit> visibility:private [final]' type=kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit> origin=null receiver: GET_VAR ': .Tag.Tag> declared in .Tag.component1' type=.Tag.Tag> origin=null - FUN GENERATED_DATA_CLASS_MEMBER name:copy visibility:public modality:FINAL <> ($this:.Tag.Tag>, action:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> }) returnType:.Tag.Tag> + FUN GENERATED_DATA_CLASS_MEMBER name:copy visibility:public modality:FINAL <> ($this:.Tag.Tag>, action:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>) returnType:.Tag.Tag> $this: VALUE_PARAMETER name: type:.Tag.Tag> - VALUE_PARAMETER name:action index:0 type:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> } + VALUE_PARAMETER name:action index:0 type:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit> EXPRESSION_BODY - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:action type:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> } visibility:private [final]' type=kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> } origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:action type:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit> visibility:private [final]' type=kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit> origin=null receiver: GET_VAR ': .Tag.Tag> declared in .Tag.copy' type=.Tag.Tag> origin=null BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun copy (action: kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> }): .Tag.Tag> declared in .Tag' - CONSTRUCTOR_CALL 'public constructor (action: kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> }) declared in .Tag' type=.Tag.Tag> origin=null + RETURN type=kotlin.Nothing from='public final fun copy (action: kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>): .Tag.Tag> declared in .Tag' + CONSTRUCTOR_CALL 'public constructor (action: kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>) declared in .Tag' type=.Tag.Tag> origin=null : RenderingT of .Tag - action: GET_VAR 'action: kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> } declared in .Tag.copy' type=kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> } origin=null + action: GET_VAR 'action: kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit> declared in .Tag.copy' type=kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit> origin=null FUN GENERATED_DATA_CLASS_MEMBER name:toString visibility:public modality:OPEN <> ($this:.Tag.Tag>) returnType:kotlin.String overridden: public open fun toString (): kotlin.String declared in kotlin.Any @@ -46,7 +46,7 @@ FILE fqName: fileName:/typeAliasWithUnsafeVariance.kt STRING_CONCATENATION type=kotlin.String CONST String type=kotlin.String value="Tag(" CONST String type=kotlin.String value="action=" - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:action type:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> } visibility:private [final]' type=kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> } origin=null + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:action type:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit> visibility:private [final]' type=kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit> origin=null receiver: GET_VAR ': .Tag.Tag> declared in .Tag.toString' type=.Tag.Tag> origin=null CONST String type=kotlin.String value=")" FUN GENERATED_DATA_CLASS_MEMBER name:hashCode visibility:public modality:OPEN <> ($this:.Tag.Tag>) returnType:kotlin.Int @@ -56,7 +56,7 @@ FILE fqName: fileName:/typeAliasWithUnsafeVariance.kt BLOCK_BODY RETURN type=kotlin.Nothing from='public open fun hashCode (): kotlin.Int declared in .Tag' CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Function1' type=kotlin.Int origin=null - $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:action type:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> } visibility:private [final]' type=kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> } origin=null + $this: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:action type:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit> visibility:private [final]' type=kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit> origin=null receiver: GET_VAR ': .Tag.Tag> declared in .Tag.hashCode' type=.Tag.Tag> origin=null FUN GENERATED_DATA_CLASS_MEMBER name:equals visibility:public modality:OPEN <> ($this:.Tag.Tag>, other:kotlin.Any?) returnType:kotlin.Boolean [operator] overridden: @@ -84,9 +84,9 @@ FILE fqName: fileName:/typeAliasWithUnsafeVariance.kt BRANCH if: CALL 'public final fun not (): kotlin.Boolean declared in kotlin.Boolean' type=kotlin.Boolean origin=EXCLEQ $this: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EXCLEQ - arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:action type:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> } visibility:private [final]' type=kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> } origin=null + arg0: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:action type:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit> visibility:private [final]' type=kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit> origin=null receiver: GET_VAR ': .Tag.Tag> declared in .Tag.equals' type=.Tag.Tag> origin=null - arg1: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:action type:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> } visibility:private [final]' type=kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> } origin=null + arg1: GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:action type:kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit> visibility:private [final]' type=kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit> origin=null receiver: GET_VAR 'val tmp_0: .Tag.Tag> declared in .Tag.equals' type=.Tag.Tag> origin=null then: RETURN type=kotlin.Nothing from='public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in .Tag' CONST Boolean type=kotlin.Boolean value=false @@ -99,5 +99,5 @@ FILE fqName: fileName:/typeAliasWithUnsafeVariance.kt FUN name:doAction visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - CALL 'public final fun (): kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit>{ .Action.Tag> } declared in .Tag' type=kotlin.Function1{ .Action } origin=GET_PROPERTY + CALL 'public final fun (): kotlin.Function1<@[UnsafeVariance] RenderingT of .Tag, kotlin.Unit> declared in .Tag' type=kotlin.Function1 origin=GET_PROPERTY $this: CALL 'public final fun getTag (): .Tag<*> declared in ' type=.Tag<*> origin=null diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/IrTextDumpHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/IrTextDumpHandler.kt index 3abceedbdba..c99c1c7d8c3 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/IrTextDumpHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/IrTextDumpHandler.kt @@ -70,6 +70,10 @@ class IrTextDumpHandler( normalizeNames = true, printFacadeClassInFqNames = false, printFlagsInDeclarationReferences = false, + // KT-60248 Abbreviations should not be rendered to make K2 IR dumps closer to K1 IR dumps during irText tests. + // PSI2IR assigns field `abbreviation` with type abbreviation. It serves only debugging purposes, and no compiler functionality relies on it. + // FIR2IR does not initialize field `abbreviation` at all. + printTypeAbbreviations = false, ) info.processAllIrModuleFragments(module) { irModuleFragment, moduleName ->