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 bab9485ac63..72dd440de38 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 @@ -48,11 +48,14 @@ fun IrFile.dumpTreesFromLineNumber(lineNumber: Int, options: DumpIrTreeOptions = * @property normalizeNames Rename temporary local variables using a stable naming scheme * @property stableOrder Print declarations in a sorted order * @property verboseErrorTypes Whether to dump the value of [IrErrorType.kotlinType] for [IrErrorType] nodes + * @property printFacadeClassInFqNames Whether printed fully-qualified names of top-level declarations should include the name of + * the file facade class (see [IrDeclarationOrigin.FILE_CLASS]) */ data class DumpIrTreeOptions( val normalizeNames: Boolean = false, val stableOrder: Boolean = false, val verboseErrorTypes: Boolean = true, + val printFacadeClassInFqNames: 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 20d15215a54..00ff496ebdc 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 @@ -211,10 +211,7 @@ class RenderIrElementVisitor(private val options: DumpIrTreeOptions = DumpIrTree } is IrDeclaration -> { renderParentOfReferencedDeclaration(parent) - append('.') - if (parent is IrDeclarationWithName) { - append(parent.name) - } else { + appendDeclarationNameToFqName(parent, options) { renderElementNameFallback(parent) } } @@ -538,51 +535,63 @@ internal fun DescriptorRenderer.renderDescriptor(descriptor: DeclarationDescript internal fun IrDeclaration.renderOriginIfNonTrivial(): String = if (origin != IrDeclarationOrigin.DEFINED) "$origin " else "" -internal fun IrClassifierSymbol.renderClassifierFqn(): String = +internal fun IrClassifierSymbol.renderClassifierFqn(options: DumpIrTreeOptions): String = if (isBound) when (val owner = owner) { - is IrClass -> owner.renderClassFqn() - is IrScript -> owner.renderScriptFqn() - is IrTypeParameter -> owner.renderTypeParameterFqn() - else -> "`unexpected classifier: ${owner.render()}`" + is IrClass -> owner.renderClassFqn(options) + is IrScript -> owner.renderScriptFqn(options) + is IrTypeParameter -> owner.renderTypeParameterFqn(options) + else -> "`unexpected classifier: ${owner.render(options)}`" } else "" -internal fun IrTypeAliasSymbol.renderTypeAliasFqn(): String = +internal fun IrTypeAliasSymbol.renderTypeAliasFqn(options: DumpIrTreeOptions): String = if (isBound) - StringBuilder().also { owner.renderDeclarationFqn(it) }.toString() + StringBuilder().also { owner.renderDeclarationFqn(it, options) }.toString() else "" -internal fun IrClass.renderClassFqn(): String = - StringBuilder().also { renderDeclarationFqn(it) }.toString() +internal fun IrClass.renderClassFqn(options: DumpIrTreeOptions): String = + StringBuilder().also { renderDeclarationFqn(it, options) }.toString() -internal fun IrScript.renderScriptFqn(): String = - StringBuilder().also { renderDeclarationFqn(it) }.toString() +internal fun IrScript.renderScriptFqn(options: DumpIrTreeOptions): String = + StringBuilder().also { renderDeclarationFqn(it, options) }.toString() -internal fun IrTypeParameter.renderTypeParameterFqn(): String = +internal fun IrTypeParameter.renderTypeParameterFqn(options: DumpIrTreeOptions): String = StringBuilder().also { sb -> sb.append(name.asString()) sb.append(" of ") - renderDeclarationParentFqn(sb) + renderDeclarationParentFqn(sb, options) }.toString() -private fun IrDeclaration.renderDeclarationFqn(sb: StringBuilder) { - renderDeclarationParentFqn(sb) - sb.append('.') - if (this is IrDeclarationWithName) { - sb.append(name.asString()) - } else { +private inline fun StringBuilder.appendDeclarationNameToFqName( + declaration: IrDeclaration, + options: DumpIrTreeOptions, + fallback: () -> Unit +) { + if (declaration.origin != IrDeclarationOrigin.FILE_CLASS || options.printFacadeClassInFqNames) { + append('.') + if (declaration is IrDeclarationWithName) { + append(declaration.name) + } else { + fallback() + } + } +} + +private fun IrDeclaration.renderDeclarationFqn(sb: StringBuilder, options: DumpIrTreeOptions) { + renderDeclarationParentFqn(sb, options) + sb.appendDeclarationNameToFqName(this, options) { sb.append(this) } } -private fun IrDeclaration.renderDeclarationParentFqn(sb: StringBuilder) { +private fun IrDeclaration.renderDeclarationParentFqn(sb: StringBuilder, options: DumpIrTreeOptions) { try { val parent = this.parent if (parent is IrDeclaration) { - parent.renderDeclarationFqn(sb) + parent.renderDeclarationFqn(sb, options) } else if (parent is IrPackageFragment) { sb.append(parent.fqName.toString()) } @@ -743,7 +752,7 @@ private fun IrType.renderTypeInner(renderer: RenderIrElementVisitor?, options: D val isDefinitelyNotNullType = classifier is IrTypeParameterSymbol && nullability == SimpleTypeNullability.DEFINITELY_NOT_NULL if (isDefinitelyNotNullType) append("{") - append(classifier.renderClassifierFqn()) + append(classifier.renderClassifierFqn(options)) if (arguments.isNotEmpty()) { append( arguments.joinToString(prefix = "<", postfix = ">", separator = ", ") { @@ -768,7 +777,7 @@ private fun IrTypeAbbreviation.renderTypeAbbreviation(renderer: RenderIrElementV buildString { append("{ ") append(renderTypeAnnotations(annotations, renderer, options)) - append(typeAlias.renderTypeAliasFqn()) + append(typeAlias.renderTypeAliasFqn(options)) if (arguments.isNotEmpty()) { append( arguments.joinToString(prefix = "<", postfix = ">", separator = ", ") { diff --git a/compiler/testData/codegen/box/annotations/javaTargetOnPrimaryCtorParameter.fir.ir.txt b/compiler/testData/codegen/box/annotations/javaTargetOnPrimaryCtorParameter.fir.ir.txt index 7b98a7d6bae..627e45a3d22 100644 --- a/compiler/testData/codegen/box/annotations/javaTargetOnPrimaryCtorParameter.fir.ir.txt +++ b/compiler/testData/codegen/box/annotations/javaTargetOnPrimaryCtorParameter.fir.ir.txt @@ -70,7 +70,7 @@ FILE fqName: fileName:/test.kt BLOCK type=kotlin.String origin=ELVIS VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:kotlin.String? [val] CALL 'public abstract fun (): kotlin.String? declared in kotlin.reflect.KClass' type=kotlin.String? origin=GET_PROPERTY - $this: CALL 'public final fun (): kotlin.reflect.KClass> declared in kotlin.jvm.JvmClassMappingKt' type=kotlin.reflect.KClass origin=GET_PROPERTY + $this: CALL 'public final fun (): kotlin.reflect.KClass> declared in kotlin.jvm' type=kotlin.reflect.KClass origin=GET_PROPERTY : kotlin.Annotation $receiver: GET_VAR 'it: kotlin.Annotation declared in .box.' type=kotlin.Annotation origin=null WHEN type=kotlin.String origin=ELVIS @@ -91,7 +91,7 @@ FILE fqName: fileName:/test.kt $receiver: TYPE_OP type=kotlin.Array origin=IMPLICIT_NOTNULL typeOperand=kotlin.Array CALL 'public open fun getAnnotations (): @[FlexibleNullability] kotlin.Array? [fake_override] declared in java.lang.reflect.Field' type=@[FlexibleNullability] kotlin.Array? origin=GET_PROPERTY $this: CALL 'public open fun getDeclaredField (p0: @[FlexibleNullability] kotlin.String?): @[FlexibleNullability] java.lang.reflect.Field? declared in java.lang.Class' type=@[FlexibleNullability] java.lang.reflect.Field? origin=null - $this: CALL 'public final fun (): java.lang.Class> declared in kotlin.jvm.JvmClassMappingKt' type=java.lang.Class<.Foo> origin=GET_PROPERTY + $this: CALL 'public final fun (): java.lang.Class> declared in kotlin.jvm' type=java.lang.Class<.Foo> origin=GET_PROPERTY : .Foo $receiver: CLASS_REFERENCE 'CLASS CLASS name:Foo modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass<.Foo> p0: CONST String type=kotlin.String value="param" @@ -103,7 +103,7 @@ FILE fqName: fileName:/test.kt BLOCK type=kotlin.String origin=ELVIS VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:kotlin.String? [val] CALL 'public abstract fun (): kotlin.String? declared in kotlin.reflect.KClass' type=kotlin.String? origin=GET_PROPERTY - $this: CALL 'public final fun (): kotlin.reflect.KClass> declared in kotlin.jvm.JvmClassMappingKt' type=kotlin.reflect.KClass origin=GET_PROPERTY + $this: CALL 'public final fun (): kotlin.reflect.KClass> declared in kotlin.jvm' type=kotlin.reflect.KClass origin=GET_PROPERTY : @[FlexibleNullability] kotlin.Annotation? $receiver: TYPE_OP type=kotlin.Annotation origin=IMPLICIT_NOTNULL typeOperand=kotlin.Annotation GET_VAR 'it: @[FlexibleNullability] kotlin.Annotation? declared in .box.' type=@[FlexibleNullability] kotlin.Annotation? origin=null diff --git a/compiler/testData/codegen/box/annotations/javaTargetOnPrimaryCtorParameter.ir.txt b/compiler/testData/codegen/box/annotations/javaTargetOnPrimaryCtorParameter.ir.txt index 1dd0c6ef53b..cc8f16117bb 100644 --- a/compiler/testData/codegen/box/annotations/javaTargetOnPrimaryCtorParameter.ir.txt +++ b/compiler/testData/codegen/box/annotations/javaTargetOnPrimaryCtorParameter.ir.txt @@ -70,7 +70,7 @@ FILE fqName: fileName:/test.kt BLOCK type=kotlin.String origin=ELVIS VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:kotlin.String? [val] CALL 'public abstract fun (): kotlin.String? declared in kotlin.reflect.KClass' type=kotlin.String? origin=GET_PROPERTY - $this: CALL 'public final fun (): kotlin.reflect.KClass> declared in kotlin.jvm.JvmClassMappingKt' type=kotlin.reflect.KClass origin=GET_PROPERTY + $this: CALL 'public final fun (): kotlin.reflect.KClass> declared in kotlin.jvm' type=kotlin.reflect.KClass origin=GET_PROPERTY : kotlin.Annotation $receiver: GET_VAR 'it: kotlin.Annotation declared in .box.' type=kotlin.Annotation origin=null WHEN type=kotlin.String origin=null @@ -92,7 +92,7 @@ FILE fqName: fileName:/test.kt CALL 'public open fun getAnnotations (): @[FlexibleNullability] kotlin.Array? [fake_override] declared in java.lang.reflect.Field' type=@[FlexibleNullability] kotlin.Array? origin=GET_PROPERTY $this: TYPE_OP type=java.lang.reflect.Field origin=IMPLICIT_NOTNULL typeOperand=java.lang.reflect.Field CALL 'public open fun getDeclaredField (p0: @[FlexibleNullability] kotlin.String?): @[FlexibleNullability] java.lang.reflect.Field? declared in java.lang.Class' type=@[FlexibleNullability] java.lang.reflect.Field? origin=null - $this: CALL 'public final fun (): java.lang.Class> declared in kotlin.jvm.JvmClassMappingKt' type=java.lang.Class<.Foo> origin=GET_PROPERTY + $this: CALL 'public final fun (): java.lang.Class> declared in kotlin.jvm' type=java.lang.Class<.Foo> origin=GET_PROPERTY : .Foo $receiver: CLASS_REFERENCE 'CLASS CLASS name:Foo modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass<.Foo> p0: CONST String type=kotlin.String value="param" @@ -104,7 +104,7 @@ FILE fqName: fileName:/test.kt BLOCK type=kotlin.String origin=ELVIS VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:kotlin.String? [val] CALL 'public abstract fun (): kotlin.String? declared in kotlin.reflect.KClass' type=kotlin.String? origin=GET_PROPERTY - $this: CALL 'public final fun (): kotlin.reflect.KClass> declared in kotlin.jvm.JvmClassMappingKt' type=kotlin.reflect.KClass origin=GET_PROPERTY + $this: CALL 'public final fun (): kotlin.reflect.KClass> declared in kotlin.jvm' type=kotlin.reflect.KClass origin=GET_PROPERTY : @[FlexibleNullability] kotlin.Annotation? $receiver: GET_VAR 'it: @[FlexibleNullability] kotlin.Annotation? declared in .box.' type=@[FlexibleNullability] kotlin.Annotation? origin=null WHEN type=kotlin.String origin=null diff --git a/compiler/testData/codegen/box/annotations/targetOnPrimaryCtorParameter.fir.ir.txt b/compiler/testData/codegen/box/annotations/targetOnPrimaryCtorParameter.fir.ir.txt index 2f42411d119..9efeea69b98 100644 --- a/compiler/testData/codegen/box/annotations/targetOnPrimaryCtorParameter.fir.ir.txt +++ b/compiler/testData/codegen/box/annotations/targetOnPrimaryCtorParameter.fir.ir.txt @@ -197,7 +197,7 @@ FILE fqName: fileName:/targetOnPrimaryCtorParameter.kt BLOCK type=kotlin.String origin=ELVIS VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:kotlin.String? [val] CALL 'public abstract fun (): kotlin.String? declared in kotlin.reflect.KClass' type=kotlin.String? origin=GET_PROPERTY - $this: CALL 'public final fun (): kotlin.reflect.KClass> declared in kotlin.jvm.JvmClassMappingKt' type=kotlin.reflect.KClass origin=GET_PROPERTY + $this: CALL 'public final fun (): kotlin.reflect.KClass> declared in kotlin.jvm' type=kotlin.reflect.KClass origin=GET_PROPERTY : kotlin.Annotation $receiver: GET_VAR 'it: kotlin.Annotation declared in .box.' type=kotlin.Annotation origin=null WHEN type=kotlin.String origin=ELVIS @@ -218,7 +218,7 @@ FILE fqName: fileName:/targetOnPrimaryCtorParameter.kt $receiver: CALL 'public abstract fun (): kotlin.collections.List [fake_override] declared in kotlin.reflect.KProperty1' type=kotlin.collections.List origin=GET_PROPERTY $this: CALL 'public final fun single (): T of kotlin.collections.CollectionsKt.single declared in kotlin.collections.CollectionsKt' type=kotlin.reflect.KProperty1<.Foo, *> origin=null : kotlin.reflect.KProperty1<.Foo, *> - $receiver: CALL 'public final fun (): kotlin.collections.Collection, *>> declared in kotlin.reflect.full.KClasses' type=kotlin.collections.Collection.Foo, *>> origin=GET_PROPERTY + $receiver: CALL 'public final fun (): kotlin.collections.Collection, *>> declared in kotlin.reflect.full' type=kotlin.collections.Collection.Foo, *>> origin=GET_PROPERTY : .Foo $receiver: GET_VAR 'val clazz: kotlin.reflect.KClass<.Foo> [val] declared in .box' type=kotlin.reflect.KClass<.Foo> origin=null transform: FUN_EXPR type=kotlin.Function1 origin=LAMBDA @@ -229,7 +229,7 @@ FILE fqName: fileName:/targetOnPrimaryCtorParameter.kt BLOCK type=kotlin.String origin=ELVIS VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:kotlin.String? [val] CALL 'public abstract fun (): kotlin.String? declared in kotlin.reflect.KClass' type=kotlin.String? origin=GET_PROPERTY - $this: CALL 'public final fun (): kotlin.reflect.KClass> declared in kotlin.jvm.JvmClassMappingKt' type=kotlin.reflect.KClass origin=GET_PROPERTY + $this: CALL 'public final fun (): kotlin.reflect.KClass> declared in kotlin.jvm' type=kotlin.reflect.KClass origin=GET_PROPERTY : kotlin.Annotation $receiver: GET_VAR 'it: kotlin.Annotation declared in .box.' type=kotlin.Annotation origin=null WHEN type=kotlin.String origin=ELVIS @@ -250,7 +250,7 @@ FILE fqName: fileName:/targetOnPrimaryCtorParameter.kt $receiver: TYPE_OP type=kotlin.Array origin=IMPLICIT_NOTNULL typeOperand=kotlin.Array CALL 'public open fun getAnnotations (): @[FlexibleNullability] kotlin.Array? [fake_override] declared in java.lang.reflect.Field' type=@[FlexibleNullability] kotlin.Array? origin=GET_PROPERTY $this: CALL 'public open fun getDeclaredField (p0: @[FlexibleNullability] kotlin.String?): @[FlexibleNullability] java.lang.reflect.Field? declared in java.lang.Class' type=@[FlexibleNullability] java.lang.reflect.Field? origin=null - $this: CALL 'public final fun (): java.lang.Class> declared in kotlin.jvm.JvmClassMappingKt' type=java.lang.Class<.Foo> origin=GET_PROPERTY + $this: CALL 'public final fun (): java.lang.Class> declared in kotlin.jvm' type=java.lang.Class<.Foo> origin=GET_PROPERTY : .Foo $receiver: CLASS_REFERENCE 'CLASS CLASS name:Foo modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass<.Foo> p0: CONST String type=kotlin.String value="param" @@ -262,7 +262,7 @@ FILE fqName: fileName:/targetOnPrimaryCtorParameter.kt BLOCK type=kotlin.String origin=ELVIS VAR IR_TEMPORARY_VARIABLE name:tmp_2 type:kotlin.String? [val] CALL 'public abstract fun (): kotlin.String? declared in kotlin.reflect.KClass' type=kotlin.String? origin=GET_PROPERTY - $this: CALL 'public final fun (): kotlin.reflect.KClass> declared in kotlin.jvm.JvmClassMappingKt' type=kotlin.reflect.KClass origin=GET_PROPERTY + $this: CALL 'public final fun (): kotlin.reflect.KClass> declared in kotlin.jvm' type=kotlin.reflect.KClass origin=GET_PROPERTY : @[FlexibleNullability] kotlin.Annotation? $receiver: TYPE_OP type=kotlin.Annotation origin=IMPLICIT_NOTNULL typeOperand=kotlin.Annotation GET_VAR 'it: @[FlexibleNullability] kotlin.Annotation? declared in .box.' type=@[FlexibleNullability] kotlin.Annotation? origin=null diff --git a/compiler/testData/codegen/box/annotations/targetOnPrimaryCtorParameter.ir.txt b/compiler/testData/codegen/box/annotations/targetOnPrimaryCtorParameter.ir.txt index b2f61a8fc16..3d154ad469f 100644 --- a/compiler/testData/codegen/box/annotations/targetOnPrimaryCtorParameter.ir.txt +++ b/compiler/testData/codegen/box/annotations/targetOnPrimaryCtorParameter.ir.txt @@ -197,7 +197,7 @@ FILE fqName: fileName:/targetOnPrimaryCtorParameter.kt BLOCK type=kotlin.String origin=ELVIS VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:kotlin.String? [val] CALL 'public abstract fun (): kotlin.String? declared in kotlin.reflect.KClass' type=kotlin.String? origin=GET_PROPERTY - $this: CALL 'public final fun (): kotlin.reflect.KClass> declared in kotlin.jvm.JvmClassMappingKt' type=kotlin.reflect.KClass origin=GET_PROPERTY + $this: CALL 'public final fun (): kotlin.reflect.KClass> declared in kotlin.jvm' type=kotlin.reflect.KClass origin=GET_PROPERTY : kotlin.Annotation $receiver: GET_VAR 'it: kotlin.Annotation declared in .box.' type=kotlin.Annotation origin=null WHEN type=kotlin.String origin=null @@ -218,7 +218,7 @@ FILE fqName: fileName:/targetOnPrimaryCtorParameter.kt $receiver: CALL 'public abstract fun (): kotlin.collections.List [fake_override] declared in kotlin.reflect.KProperty1' type=kotlin.collections.List origin=GET_PROPERTY $this: CALL 'public final fun single (): T of kotlin.collections.CollectionsKt.single declared in kotlin.collections.CollectionsKt' type=kotlin.reflect.KProperty1<.Foo, *> origin=null : kotlin.reflect.KProperty1<.Foo, *> - $receiver: CALL 'public final fun (): kotlin.collections.Collection, *>> declared in kotlin.reflect.full.KClasses' type=kotlin.collections.Collection.Foo, *>> origin=GET_PROPERTY + $receiver: CALL 'public final fun (): kotlin.collections.Collection, *>> declared in kotlin.reflect.full' type=kotlin.collections.Collection.Foo, *>> origin=GET_PROPERTY : .Foo $receiver: GET_VAR 'val clazz: kotlin.reflect.KClass<.Foo> [val] declared in .box' type=kotlin.reflect.KClass<.Foo> origin=null transform: FUN_EXPR type=kotlin.Function1 origin=LAMBDA @@ -229,7 +229,7 @@ FILE fqName: fileName:/targetOnPrimaryCtorParameter.kt BLOCK type=kotlin.String origin=ELVIS VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:kotlin.String? [val] CALL 'public abstract fun (): kotlin.String? declared in kotlin.reflect.KClass' type=kotlin.String? origin=GET_PROPERTY - $this: CALL 'public final fun (): kotlin.reflect.KClass> declared in kotlin.jvm.JvmClassMappingKt' type=kotlin.reflect.KClass origin=GET_PROPERTY + $this: CALL 'public final fun (): kotlin.reflect.KClass> declared in kotlin.jvm' type=kotlin.reflect.KClass origin=GET_PROPERTY : kotlin.Annotation $receiver: GET_VAR 'it: kotlin.Annotation declared in .box.' type=kotlin.Annotation origin=null WHEN type=kotlin.String origin=null @@ -251,7 +251,7 @@ FILE fqName: fileName:/targetOnPrimaryCtorParameter.kt CALL 'public open fun getAnnotations (): @[FlexibleNullability] kotlin.Array? [fake_override] declared in java.lang.reflect.Field' type=@[FlexibleNullability] kotlin.Array? origin=GET_PROPERTY $this: TYPE_OP type=java.lang.reflect.Field origin=IMPLICIT_NOTNULL typeOperand=java.lang.reflect.Field CALL 'public open fun getDeclaredField (p0: @[FlexibleNullability] kotlin.String?): @[FlexibleNullability] java.lang.reflect.Field? declared in java.lang.Class' type=@[FlexibleNullability] java.lang.reflect.Field? origin=null - $this: CALL 'public final fun (): java.lang.Class> declared in kotlin.jvm.JvmClassMappingKt' type=java.lang.Class<.Foo> origin=GET_PROPERTY + $this: CALL 'public final fun (): java.lang.Class> declared in kotlin.jvm' type=java.lang.Class<.Foo> origin=GET_PROPERTY : .Foo $receiver: CLASS_REFERENCE 'CLASS CLASS name:Foo modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass<.Foo> p0: CONST String type=kotlin.String value="param" @@ -263,7 +263,7 @@ FILE fqName: fileName:/targetOnPrimaryCtorParameter.kt BLOCK type=kotlin.String origin=ELVIS VAR IR_TEMPORARY_VARIABLE name:tmp_2 type:kotlin.String? [val] CALL 'public abstract fun (): kotlin.String? declared in kotlin.reflect.KClass' type=kotlin.String? origin=GET_PROPERTY - $this: CALL 'public final fun (): kotlin.reflect.KClass> declared in kotlin.jvm.JvmClassMappingKt' type=kotlin.reflect.KClass origin=GET_PROPERTY + $this: CALL 'public final fun (): kotlin.reflect.KClass> declared in kotlin.jvm' type=kotlin.reflect.KClass origin=GET_PROPERTY : @[FlexibleNullability] kotlin.Annotation? $receiver: GET_VAR 'it: @[FlexibleNullability] kotlin.Annotation? declared in .box.' type=@[FlexibleNullability] kotlin.Annotation? origin=null WHEN type=kotlin.String origin=null diff --git a/compiler/testData/codegen/box/fir/callableReferenceToJavaField.fir.ir.txt b/compiler/testData/codegen/box/fir/callableReferenceToJavaField.fir.ir.txt index 25d13b32ec8..a16fbbb8eed 100644 --- a/compiler/testData/codegen/box/fir/callableReferenceToJavaField.fir.ir.txt +++ b/compiler/testData/codegen/box/fir/callableReferenceToJavaField.fir.ir.txt @@ -44,7 +44,7 @@ FILE fqName:foo fileName:/main.kt CALL 'public open fun set (p0: @[FlexibleNullability] kotlin.Any?, p1: @[FlexibleNullability] kotlin.Any?): kotlin.Unit [operator] declared in java.lang.reflect.Field' type=kotlin.Unit origin=null $this: CALL 'public final fun CHECK_NOT_NULL (arg0: T0 of kotlin.internal.ir.CHECK_NOT_NULL?): {T0 of kotlin.internal.ir.CHECK_NOT_NULL & Any} declared in kotlin.internal.ir' type=java.lang.reflect.Field origin=EXCLEXCL : java.lang.reflect.Field - arg0: CALL 'public final fun (): java.lang.reflect.Field? declared in kotlin.reflect.jvm.ReflectJvmMapping' type=java.lang.reflect.Field? origin=GET_PROPERTY + arg0: CALL 'public final fun (): java.lang.reflect.Field? declared in kotlin.reflect.jvm' type=java.lang.reflect.Field? origin=GET_PROPERTY $receiver: PROPERTY_REFERENCE 'protected/*protected and package*/ open a: @[FlexibleNullability] foo.A? [var]' field='FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:a type:@[FlexibleNullability] foo.A? visibility:protected/*protected and package*/' getter='protected/*protected and package*/ open fun (): @[FlexibleNullability] foo.A? declared in bar.Base' setter='protected/*protected and package*/ open fun (: @[FlexibleNullability] foo.A?): kotlin.Unit declared in bar.Base' type=kotlin.reflect.KMutableProperty1 origin=null <1>: <2>: diff --git a/compiler/testData/codegen/box/fir/callableReferenceToJavaField.ir.txt b/compiler/testData/codegen/box/fir/callableReferenceToJavaField.ir.txt index b92e1e25bc4..d8bf09a9034 100644 --- a/compiler/testData/codegen/box/fir/callableReferenceToJavaField.ir.txt +++ b/compiler/testData/codegen/box/fir/callableReferenceToJavaField.ir.txt @@ -44,7 +44,7 @@ FILE fqName:foo fileName:/main.kt CALL 'public open fun set (p0: @[FlexibleNullability] kotlin.Any?, p1: @[FlexibleNullability] kotlin.Any?): kotlin.Unit [operator] declared in java.lang.reflect.Field' type=kotlin.Unit origin=EQ $this: CALL 'public final fun CHECK_NOT_NULL (arg0: T0 of kotlin.internal.ir.CHECK_NOT_NULL?): {T0 of kotlin.internal.ir.CHECK_NOT_NULL & Any} declared in kotlin.internal.ir' type=java.lang.reflect.Field origin=EXCLEXCL : java.lang.reflect.Field - arg0: CALL 'public final fun (): java.lang.reflect.Field? declared in kotlin.reflect.jvm.ReflectJvmMapping' type=java.lang.reflect.Field? origin=GET_PROPERTY + arg0: CALL 'public final fun (): java.lang.reflect.Field? declared in kotlin.reflect.jvm' type=java.lang.reflect.Field? origin=GET_PROPERTY $receiver: PROPERTY_REFERENCE 'protected/*protected and package*/ final a [fake_override,var]' field='FIELD IR_EXTERNAL_JAVA_DECLARATION_STUB name:a type:@[FlexibleNullability] foo.A? visibility:protected/*protected and package*/' getter=null setter=null type=kotlin.reflect.KMutableProperty1 origin=null p0: GET_VAR ': foo.Derived declared in foo.Derived.foo' type=foo.Derived origin=null p1: CONSTRUCTOR_CALL 'public constructor (s: kotlin.String) [primary] declared in foo.A' type=foo.A origin=null diff --git a/compiler/testData/codegen/box/fir/noSymbolForIntRangeIterator.ir.txt b/compiler/testData/codegen/box/fir/noSymbolForIntRangeIterator.ir.txt index 542f328aa7f..f2351374d63 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 [val] 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 [inline] declared in kotlin.text.StringsKt' 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.TypeAliasesKt.StringBuilder }) returnType:kotlin.Unit - $receiver: VALUE_PARAMETER name:$this$buildString type:java.lang.StringBuilder{ kotlin.text.TypeAliasesKt.StringBuilder } + CALL 'public final fun buildString (builderAction: @[ExtensionFunctionType] kotlin.Function1): kotlin.String [inline] declared in kotlin.text.StringsKt' 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 } 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 [val] 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.TypeAliasesKt.StringBuilder } [inline] declared in kotlin.text.StringsKt' type=java.lang.StringBuilder{ kotlin.text.TypeAliasesKt.StringBuilder } origin=null - $receiver: GET_VAR '$this$buildString: java.lang.StringBuilder{ kotlin.text.TypeAliasesKt.StringBuilder } declared in .test.localFunc.' type=java.lang.StringBuilder{ kotlin.text.TypeAliasesKt.StringBuilder } origin=null + CALL 'public final fun appendLine (value: kotlin.String?): java.lang.StringBuilder{ kotlin.text.StringBuilder } [inline] declared in kotlin.text.StringsKt' 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 value: STRING_CONCATENATION type=kotlin.String CALL 'public final fun times (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=MUL $this: GET_VAR 'val i: kotlin.Int [val] declared in .test.localFunc' type=kotlin.Int origin=null diff --git a/compiler/testData/codegen/box/unsignedTypes/implicitIntegerCoercionNamedArg.fir.ir.txt b/compiler/testData/codegen/box/unsignedTypes/implicitIntegerCoercionNamedArg.fir.ir.txt index 3b0c3bc84a9..faec5539513 100644 --- a/compiler/testData/codegen/box/unsignedTypes/implicitIntegerCoercionNamedArg.fir.ir.txt +++ b/compiler/testData/codegen/box/unsignedTypes/implicitIntegerCoercionNamedArg.fir.ir.txt @@ -43,36 +43,36 @@ FILE fqName: fileName:/test.kt if: CALL 'public final fun not (): kotlin.Boolean [operator] 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: CALL 'public final fun testInt (x: kotlin.UInt): kotlin.UInt declared in ' type=kotlin.UInt origin=null - x: CALL 'public final fun toUInt (): kotlin.UInt [inline] declared in kotlin.UIntKt' type=kotlin.UInt origin=null + x: CALL 'public final fun toUInt (): kotlin.UInt [inline] declared in kotlin' type=kotlin.UInt origin=null $receiver: CONST Int type=kotlin.Int value=5 - arg1: CALL 'public final fun toUInt (): kotlin.UInt [inline] declared in kotlin.UIntKt' type=kotlin.UInt origin=null + arg1: CALL 'public final fun toUInt (): kotlin.UInt [inline] declared in kotlin' type=kotlin.UInt origin=null $receiver: CONST Int type=kotlin.Int value=5 then: CONST String type=kotlin.String value="Fail: testInt(5)" BRANCH if: CALL 'public final fun not (): kotlin.Boolean [operator] 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: CALL 'public final fun testInt (x: kotlin.UInt): kotlin.UInt declared in ' type=kotlin.UInt origin=null - x: CALL 'public final fun toUInt (): kotlin.UInt [inline] declared in kotlin.UIntKt' type=kotlin.UInt origin=null + x: CALL 'public final fun toUInt (): kotlin.UInt [inline] declared in kotlin' type=kotlin.UInt origin=null $receiver: CONST Int type=kotlin.Int value=5 - arg1: CALL 'public final fun toUInt (): kotlin.UInt [inline] declared in kotlin.UIntKt' type=kotlin.UInt origin=null + arg1: CALL 'public final fun toUInt (): kotlin.UInt [inline] declared in kotlin' type=kotlin.UInt origin=null $receiver: CONST Int type=kotlin.Int value=5 then: CONST String type=kotlin.String value="Fail: testInt(x = 5)" BRANCH if: CALL 'public final fun not (): kotlin.Boolean [operator] 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: CALL 'public final fun testLong (x: kotlin.ULong): kotlin.ULong declared in ' type=kotlin.ULong origin=null - x: CALL 'public final fun toULong (): kotlin.ULong [inline] declared in kotlin.ULongKt' type=kotlin.ULong origin=null + x: CALL 'public final fun toULong (): kotlin.ULong [inline] declared in kotlin' type=kotlin.ULong origin=null $receiver: CONST Int type=kotlin.Int value=5 - arg1: CALL 'public final fun toULong (): kotlin.ULong [inline] declared in kotlin.ULongKt' type=kotlin.ULong origin=null + arg1: CALL 'public final fun toULong (): kotlin.ULong [inline] declared in kotlin' type=kotlin.ULong origin=null $receiver: CONST Long type=kotlin.Long value=5 then: CONST String type=kotlin.String value="Fail: testLong(5L)" BRANCH if: CALL 'public final fun not (): kotlin.Boolean [operator] 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: CALL 'public final fun testLong (x: kotlin.ULong): kotlin.ULong declared in ' type=kotlin.ULong origin=null - x: CALL 'public final fun toULong (): kotlin.ULong [inline] declared in kotlin.ULongKt' type=kotlin.ULong origin=null + x: CALL 'public final fun toULong (): kotlin.ULong [inline] declared in kotlin' type=kotlin.ULong origin=null $receiver: CONST Int type=kotlin.Int value=5 - arg1: CALL 'public final fun toULong (): kotlin.ULong [inline] declared in kotlin.ULongKt' type=kotlin.ULong origin=null + arg1: CALL 'public final fun toULong (): kotlin.ULong [inline] declared in kotlin' type=kotlin.ULong origin=null $receiver: CONST Long type=kotlin.Long value=5 then: CONST String type=kotlin.String value="Fail: testLong(x = 5L)" BRANCH diff --git a/compiler/testData/codegen/box/unsignedTypes/implicitIntegerCoercionNamedArg.ir.txt b/compiler/testData/codegen/box/unsignedTypes/implicitIntegerCoercionNamedArg.ir.txt index 3bfecb53db3..93b0734c90c 100644 --- a/compiler/testData/codegen/box/unsignedTypes/implicitIntegerCoercionNamedArg.ir.txt +++ b/compiler/testData/codegen/box/unsignedTypes/implicitIntegerCoercionNamedArg.ir.txt @@ -44,7 +44,7 @@ FILE fqName: fileName:/test.kt $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: CALL 'public final fun testInt (x: kotlin.UInt): kotlin.UInt declared in ' type=kotlin.UInt origin=null x: CONST Int type=kotlin.UInt value=5 - arg1: CALL 'public final fun toUInt (): kotlin.UInt [inline] declared in kotlin.UIntKt' type=kotlin.UInt origin=null + arg1: CALL 'public final fun toUInt (): kotlin.UInt [inline] declared in kotlin' type=kotlin.UInt origin=null $receiver: CONST Int type=kotlin.Int value=5 then: CONST String type=kotlin.String value="Fail: testInt(5)" BRANCH @@ -52,7 +52,7 @@ FILE fqName: fileName:/test.kt $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: CALL 'public final fun testInt (x: kotlin.UInt): kotlin.UInt declared in ' type=kotlin.UInt origin=null x: CONST Int type=kotlin.UInt value=5 - arg1: CALL 'public final fun toUInt (): kotlin.UInt [inline] declared in kotlin.UIntKt' type=kotlin.UInt origin=null + arg1: CALL 'public final fun toUInt (): kotlin.UInt [inline] declared in kotlin' type=kotlin.UInt origin=null $receiver: CONST Int type=kotlin.Int value=5 then: CONST String type=kotlin.String value="Fail: testInt(x = 5)" BRANCH @@ -60,7 +60,7 @@ FILE fqName: fileName:/test.kt $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: CALL 'public final fun testLong (x: kotlin.ULong): kotlin.ULong declared in ' type=kotlin.ULong origin=null x: CONST Long type=kotlin.ULong value=5 - arg1: CALL 'public final fun toULong (): kotlin.ULong [inline] declared in kotlin.ULongKt' type=kotlin.ULong origin=null + arg1: CALL 'public final fun toULong (): kotlin.ULong [inline] declared in kotlin' type=kotlin.ULong origin=null $receiver: CONST Long type=kotlin.Long value=5 then: CONST String type=kotlin.String value="Fail: testLong(5L)" BRANCH @@ -68,7 +68,7 @@ FILE fqName: fileName:/test.kt $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: CALL 'public final fun testLong (x: kotlin.ULong): kotlin.ULong declared in ' type=kotlin.ULong origin=null x: CONST Long type=kotlin.ULong value=5 - arg1: CALL 'public final fun toULong (): kotlin.ULong [inline] declared in kotlin.ULongKt' type=kotlin.ULong origin=null + arg1: CALL 'public final fun toULong (): kotlin.ULong [inline] declared in kotlin' type=kotlin.ULong origin=null $receiver: CONST Long type=kotlin.Long value=5 then: CONST String type=kotlin.String value="Fail: testLong(x = 5L)" BRANCH diff --git a/compiler/testData/ir/irText/classes/classMembers.ir.txt b/compiler/testData/ir/irText/classes/classMembers.ir.txt index 3a6d20f04be..9c1475e77d9 100644 --- a/compiler/testData/ir/irText/classes/classMembers.ir.txt +++ b/compiler/testData/ir/irText/classes/classMembers.ir.txt @@ -83,13 +83,13 @@ FILE fqName: fileName:/classMembers.kt FUN name:function visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Unit $this: VALUE_PARAMETER name: type:.C BLOCK_BODY - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: CONST String type=kotlin.String value="1" FUN name:memberExtensionFunction visibility:public modality:FINAL <> ($this:.C, $receiver:kotlin.Int) returnType:kotlin.Unit $this: VALUE_PARAMETER name: type:.C $receiver: VALUE_PARAMETER name: type:kotlin.Int BLOCK_BODY - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: CONST String type=kotlin.String value="2" CLASS CLASS name:NestedClass modality:FINAL visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.C.NestedClass @@ -100,13 +100,13 @@ FILE fqName: fileName:/classMembers.kt FUN name:function visibility:public modality:FINAL <> ($this:.C.NestedClass) returnType:kotlin.Unit $this: VALUE_PARAMETER name: type:.C.NestedClass BLOCK_BODY - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: CONST String type=kotlin.String value="3" FUN name:memberExtensionFunction visibility:public modality:FINAL <> ($this:.C.NestedClass, $receiver:kotlin.Int) returnType:kotlin.Unit $this: VALUE_PARAMETER name: type:.C.NestedClass $receiver: VALUE_PARAMETER name: type:kotlin.Int BLOCK_BODY - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: CONST String type=kotlin.String value="4" 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/classes/enum.fir.ir.txt b/compiler/testData/ir/irText/classes/enum.fir.ir.txt index e06f3ceb530..7a9055138ae 100644 --- a/compiler/testData/ir/irText/classes/enum.fir.ir.txt +++ b/compiler/testData/ir/irText/classes/enum.fir.ir.txt @@ -162,7 +162,7 @@ FILE fqName: fileName:/enum.kt public abstract fun foo (): kotlin.Unit declared in .TestEnum3 $this: VALUE_PARAMETER name: type:.TestEnum3.TEST BLOCK_BODY - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: CONST String type=kotlin.String value="Hello, world!" FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any [fake_override] overridden: @@ -289,7 +289,7 @@ FILE fqName: fileName:/enum.kt public abstract fun foo (): kotlin.Unit declared in .TestEnum4 $this: VALUE_PARAMETER name: type:.TestEnum4.TEST1 BLOCK_BODY - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: GET_ENUM 'ENUM_ENTRY name:TEST1' type=.TestEnum4 PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [fake_override,val] overridden: @@ -369,7 +369,7 @@ FILE fqName: fileName:/enum.kt public abstract fun foo (): kotlin.Unit declared in .TestEnum4 $this: VALUE_PARAMETER name: type:.TestEnum4.TEST2 BLOCK_BODY - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: GET_ENUM 'ENUM_ENTRY name:TEST2' type=.TestEnum4 PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [fake_override,val] overridden: diff --git a/compiler/testData/ir/irText/classes/enum.ir.txt b/compiler/testData/ir/irText/classes/enum.ir.txt index e20a4a80ed7..8a74e82aefb 100644 --- a/compiler/testData/ir/irText/classes/enum.ir.txt +++ b/compiler/testData/ir/irText/classes/enum.ir.txt @@ -179,7 +179,7 @@ FILE fqName: fileName:/enum.kt public abstract fun foo (): kotlin.Unit declared in .TestEnum3 $this: VALUE_PARAMETER name: type:.TestEnum3.TEST BLOCK_BODY - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: CONST String type=kotlin.String value="Hello, world!" PROPERTY FAKE_OVERRIDE name:name visibility:public modality:FINAL [fake_override,val] annotations: @@ -323,7 +323,7 @@ FILE fqName: fileName:/enum.kt public abstract fun foo (): kotlin.Unit declared in .TestEnum4 $this: VALUE_PARAMETER name: type:.TestEnum4.TEST1 BLOCK_BODY - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: GET_ENUM 'ENUM_ENTRY name:TEST1' type=.TestEnum4 PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [fake_override,val] overridden: @@ -412,7 +412,7 @@ FILE fqName: fileName:/enum.kt public abstract fun foo (): kotlin.Unit declared in .TestEnum4 $this: VALUE_PARAMETER name: type:.TestEnum4.TEST2 BLOCK_BODY - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: GET_ENUM 'ENUM_ENTRY name:TEST2' type=.TestEnum4 PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [fake_override,val] overridden: diff --git a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.fir.ir.txt b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.fir.ir.txt index 0e85798bea2..efc8fc19cda 100644 --- a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.fir.ir.txt +++ b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.fir.ir.txt @@ -186,7 +186,7 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt public abstract fun foo (): kotlin.Unit declared in .Test2 $this: VALUE_PARAMETER name: type:.Test2.ZERO BLOCK_BODY - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: CONST String type=kotlin.String value="ZERO" PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [fake_override,val] overridden: @@ -251,7 +251,7 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt public abstract fun foo (): kotlin.Unit declared in .Test2 $this: VALUE_PARAMETER name: type:.Test2.ONE BLOCK_BODY - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: CONST String type=kotlin.String value="ONE" PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [fake_override,val] overridden: diff --git a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.ir.txt b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.ir.txt index 2b9e2112a23..28180b5e81a 100644 --- a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.ir.txt +++ b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.ir.txt @@ -203,7 +203,7 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt public abstract fun foo (): kotlin.Unit declared in .Test2 $this: VALUE_PARAMETER name: type:.Test2.ZERO BLOCK_BODY - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: CONST String type=kotlin.String value="ZERO" PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [fake_override,val] overridden: @@ -277,7 +277,7 @@ FILE fqName: fileName:/enumWithSecondaryCtor.kt public abstract fun foo (): kotlin.Unit declared in .Test2 $this: VALUE_PARAMETER name: type:.Test2.ONE BLOCK_BODY - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: CONST String type=kotlin.String value="ONE" PROPERTY FAKE_OVERRIDE name:x visibility:public modality:FINAL [fake_override,val] overridden: diff --git a/compiler/testData/ir/irText/classes/initBlock.ir.txt b/compiler/testData/ir/irText/classes/initBlock.ir.txt index de0415d59e1..c54d2f1efe6 100644 --- a/compiler/testData/ir/irText/classes/initBlock.ir.txt +++ b/compiler/testData/ir/irText/classes/initBlock.ir.txt @@ -7,7 +7,7 @@ FILE fqName: fileName:/initBlock.kt INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:FINAL visibility:public superTypes:[kotlin.Any]' ANONYMOUS_INITIALIZER isStatic=false BLOCK_BODY - CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any @@ -41,7 +41,7 @@ FILE fqName: fileName:/initBlock.kt receiver: GET_VAR ': .Test2 declared in .Test2.' type=.Test2 origin=null ANONYMOUS_INITIALIZER isStatic=false BLOCK_BODY - CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any @@ -59,7 +59,7 @@ FILE fqName: fileName:/initBlock.kt $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Test3 ANONYMOUS_INITIALIZER isStatic=false BLOCK_BODY - CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null CONSTRUCTOR visibility:public <> () returnType:.Test3 BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' @@ -81,7 +81,7 @@ FILE fqName: fileName:/initBlock.kt $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Test4 ANONYMOUS_INITIALIZER isStatic=false BLOCK_BODY - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: CONST String type=kotlin.String value="1" CONSTRUCTOR visibility:public <> () returnType:.Test4 BLOCK_BODY @@ -89,7 +89,7 @@ FILE fqName: fileName:/initBlock.kt INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test4 modality:FINAL visibility:public superTypes:[kotlin.Any]' ANONYMOUS_INITIALIZER isStatic=false BLOCK_BODY - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: CONST String type=kotlin.String value="2" FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: @@ -112,7 +112,7 @@ FILE fqName: fileName:/initBlock.kt INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test5 modality:FINAL visibility:public superTypes:[kotlin.Any]' ANONYMOUS_INITIALIZER isStatic=false BLOCK_BODY - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: CONST String type=kotlin.String value="1" CLASS CLASS name:TestInner modality:FINAL visibility:public [inner] superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.Test5.TestInner @@ -123,7 +123,7 @@ FILE fqName: fileName:/initBlock.kt INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInner modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]' ANONYMOUS_INITIALIZER isStatic=false BLOCK_BODY - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: CONST String type=kotlin.String value="2" 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/classes/objectLiteralExpressions.ir.txt b/compiler/testData/ir/irText/classes/objectLiteralExpressions.ir.txt index a5a5f30de8b..f698ab93bb8 100644 --- a/compiler/testData/ir/irText/classes/objectLiteralExpressions.ir.txt +++ b/compiler/testData/ir/irText/classes/objectLiteralExpressions.ir.txt @@ -60,7 +60,7 @@ FILE fqName: fileName:/objectLiteralExpressions.kt public abstract fun foo (): kotlin.Unit declared in .IFoo $this: VALUE_PARAMETER name: type:.test2. BLOCK_BODY - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: CONST String type=kotlin.String value="foo" FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: @@ -128,7 +128,7 @@ FILE fqName: fileName:/objectLiteralExpressions.kt public abstract fun foo (): kotlin.Unit [fake_override] declared in .Outer.Inner $this: VALUE_PARAMETER name: type:.Outer.test3. BLOCK_BODY - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: CONST String type=kotlin.String value="foo" FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: @@ -174,7 +174,7 @@ FILE fqName: fileName:/objectLiteralExpressions.kt public abstract fun foo (): kotlin.Unit [fake_override] declared in .Outer.Inner $this: VALUE_PARAMETER name: type:.test4. BLOCK_BODY - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: CONST String type=kotlin.String value="foo" 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/declarations/classLevelProperties.fir.ir.txt b/compiler/testData/ir/irText/declarations/classLevelProperties.fir.ir.txt index 64f3bb3ebac..db07dd89924 100644 --- a/compiler/testData/ir/irText/declarations/classLevelProperties.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/classLevelProperties.fir.ir.txt @@ -123,7 +123,7 @@ FILE fqName: fileName:/classLevelProperties.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' - CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V1 of kotlin.collections.MapAccessorsKt.getValue [inline,operator] declared in kotlin.collections.MapAccessorsKt' type=kotlin.Int origin=null + CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V1 of kotlin.collections.getValue [inline,operator] 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 visibility:private [final]' type=java.util.HashMap origin=null @@ -135,7 +135,7 @@ FILE fqName: fileName:/classLevelProperties.kt $this: VALUE_PARAMETER name: type:.C VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.collections.MapAccessorsKt.setValue): kotlin.Unit [inline,operator] declared in kotlin.collections.MapAccessorsKt' type=kotlin.Unit origin=null + CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.collections.setValue): kotlin.Unit [inline,operator] declared in kotlin.collections' type=kotlin.Unit origin=null : kotlin.Int $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 diff --git a/compiler/testData/ir/irText/declarations/classLevelProperties.ir.txt b/compiler/testData/ir/irText/declarations/classLevelProperties.ir.txt index 298c94c5e41..dac55dc7676 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 [delegated,val]' 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.TypeAliasesKt.HashMap } visibility:private [final] + FIELD PROPERTY_DELEGATE name:test8$delegate type:java.util.HashMap{ kotlin.collections.HashMap } visibility:private [final] EXPRESSION_BODY - CALL 'public final fun hashMapOf (): java.util.HashMap{ kotlin.collections.TypeAliasesKt.HashMap } [inline] declared in kotlin.collections.MapsKt' type=java.util.HashMap{ kotlin.collections.TypeAliasesKt.HashMap } origin=null + CALL 'public final fun hashMapOf (): java.util.HashMap{ kotlin.collections.HashMap } [inline] declared in kotlin.collections.MapsKt' type=java.util.HashMap{ kotlin.collections.HashMap } origin=null : kotlin.String : kotlin.Int FUN DELEGATED_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> ($this:.C) returnType:kotlin.Int @@ -123,10 +123,10 @@ FILE fqName: fileName:/classLevelProperties.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in .C' - CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V1 of kotlin.collections.MapAccessorsKt.getValue [inline,operator] declared in kotlin.collections.MapAccessorsKt' type=kotlin.Int origin=null + CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V1 of kotlin.collections.getValue [inline,operator] 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.TypeAliasesKt.HashMap } visibility:private [final]' type=java.util.HashMap{ kotlin.collections.TypeAliasesKt.HashMap } origin=null + $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_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 [delegated,var]' 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 @@ -136,9 +136,9 @@ FILE fqName: fileName:/classLevelProperties.kt VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY 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.MapAccessorsKt.setValue): kotlin.Unit [inline,operator] declared in kotlin.collections.MapAccessorsKt' type=kotlin.Unit origin=null + CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.collections.setValue): kotlin.Unit [inline,operator] 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.TypeAliasesKt.HashMap } visibility:private [final]' type=java.util.HashMap{ kotlin.collections.TypeAliasesKt.HashMap } origin=null + $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_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 [delegated,var]' 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 eed5e999748..123effbff79 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 [operator] 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.TypeAliasesKt.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>{ kotlin.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.TypeAliasesKt.Comparator.compareTo> } + VALUE_PARAMETER name:$context_receiver_0 index:0 type:java.util.Comparator.compareTo>{ kotlin.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.TypeAliasesKt.Comparator.compareTo> }, other: T of .compareTo): kotlin.Int [operator,infix] declared in ' + 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 [operator,infix] 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.TypeAliasesKt.Comparator.compareTo> } declared in .compareTo' type=java.util.Comparator.compareTo>{ kotlin.TypeAliasesKt.Comparator.compareTo> } 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 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.TypeAliasesKt.Comparator.> }) returnType:T of . + FUN name: visibility:public modality:FINAL ($receiver:.Pair., T of .>, $context_receiver_0:java.util.Comparator.>{ kotlin.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.TypeAliasesKt.Comparator.> } + VALUE_PARAMETER name:$context_receiver_0 index:0 type:java.util.Comparator.>{ kotlin.Comparator.> } BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun ($context_receiver_0: java.util.Comparator.>{ kotlin.TypeAliasesKt.Comparator.> }): T of . declared in ' + RETURN type=kotlin.Nothing from='public final fun ($context_receiver_0: java.util.Comparator.>{ kotlin.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.TypeAliasesKt.Comparator.compareTo> }, other: T of .compareTo): kotlin.Int [operator,infix] declared in ' type=kotlin.Int origin=LT + arg0: CALL 'public final fun compareTo ($context_receiver_0: java.util.Comparator.compareTo>{ kotlin.Comparator.compareTo> }, other: T of .compareTo): kotlin.Int [operator,infix] 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.TypeAliasesKt.Comparator.> } declared in .' type=java.util.Comparator.>{ kotlin.TypeAliasesKt.Comparator.> } 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 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.TypeAliasesKt.Comparator.> }): T of . declared in ' type=kotlin.String origin=GET_PROPERTY + CALL 'public final fun ($context_receiver_0: java.util.Comparator.>{ kotlin.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) [primary] declared in .Pair' type=.Pair origin=null : kotlin.String diff --git a/compiler/testData/ir/irText/declarations/delegatedProperties.fir.ir.txt b/compiler/testData/ir/irText/declarations/delegatedProperties.fir.ir.txt index 2634f35e305..a02a60f9d4a 100644 --- a/compiler/testData/ir/irText/declarations/delegatedProperties.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/delegatedProperties.fir.ir.txt @@ -67,7 +67,7 @@ FILE fqName: fileName:/delegatedProperties.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Any declared in .C' - CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V1 of kotlin.collections.MapAccessorsKt.getValue [inline,operator] declared in kotlin.collections.MapAccessorsKt' type=kotlin.Any origin=null + CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V1 of kotlin.collections.getValue [inline,operator] declared in kotlin.collections' type=kotlin.Any origin=null : kotlin.Any : kotlin.Any $receiver: GET_FIELD 'FIELD PROPERTY_DELEGATE name:test3$delegate type:kotlin.collections.MutableMap visibility:private [final]' type=kotlin.collections.MutableMap origin=null @@ -79,7 +79,7 @@ FILE fqName: fileName:/delegatedProperties.kt $this: VALUE_PARAMETER name: type:.C VALUE_PARAMETER name: index:0 type:kotlin.Any BLOCK_BODY - CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.collections.MapAccessorsKt.setValue): kotlin.Unit [inline,operator] declared in kotlin.collections.MapAccessorsKt' type=kotlin.Unit origin=null + CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.collections.setValue): kotlin.Unit [inline,operator] declared in kotlin.collections' type=kotlin.Unit origin=null : kotlin.Any $receiver: GET_FIELD 'FIELD PROPERTY_DELEGATE name:test3$delegate type:kotlin.collections.MutableMap visibility:private [final]' type=kotlin.collections.MutableMap origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null @@ -109,7 +109,7 @@ FILE fqName: fileName:/delegatedProperties.kt correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [delegated,var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Any declared in ' - CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V1 of kotlin.collections.MapAccessorsKt.getValue [inline,operator] declared in kotlin.collections.MapAccessorsKt' type=kotlin.Any origin=null + CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V1 of kotlin.collections.getValue [inline,operator] 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 visibility:private [final,static]' type=java.util.HashMap origin=null @@ -119,7 +119,7 @@ FILE fqName: fileName:/delegatedProperties.kt correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [delegated,var] VALUE_PARAMETER name: index:0 type:kotlin.Any BLOCK_BODY - CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.collections.MapAccessorsKt.setValue): kotlin.Unit [inline,operator] declared in kotlin.collections.MapAccessorsKt' type=kotlin.Unit origin=null + CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.collections.setValue): kotlin.Unit [inline,operator] declared in kotlin.collections' type=kotlin.Unit origin=null : kotlin.Any $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 diff --git a/compiler/testData/ir/irText/declarations/delegatedProperties.ir.txt b/compiler/testData/ir/irText/declarations/delegatedProperties.ir.txt index 39b2e1e9244..ed3c4645dec 100644 --- a/compiler/testData/ir/irText/declarations/delegatedProperties.ir.txt +++ b/compiler/testData/ir/irText/declarations/delegatedProperties.ir.txt @@ -67,7 +67,7 @@ FILE fqName: fileName:/delegatedProperties.kt $this: VALUE_PARAMETER name: type:.C BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Any declared in .C' - CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V1 of kotlin.collections.MapAccessorsKt.getValue [inline,operator] declared in kotlin.collections.MapAccessorsKt' type=kotlin.Any origin=null + CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V1 of kotlin.collections.getValue [inline,operator] declared in kotlin.collections' type=kotlin.Any origin=null : kotlin.Any : kotlin.Any $receiver: GET_FIELD 'FIELD PROPERTY_DELEGATE name:test3$delegate type:kotlin.collections.MutableMap visibility:private [final]' type=kotlin.collections.MutableMap origin=null @@ -80,7 +80,7 @@ FILE fqName: fileName:/delegatedProperties.kt VALUE_PARAMETER name: index:0 type:kotlin.Any BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (: kotlin.Any): kotlin.Unit declared in .C' - CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.collections.MapAccessorsKt.setValue): kotlin.Unit [inline,operator] declared in kotlin.collections.MapAccessorsKt' type=kotlin.Unit origin=null + CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.collections.setValue): kotlin.Unit [inline,operator] declared in kotlin.collections' type=kotlin.Unit origin=null : kotlin.Any $receiver: GET_FIELD 'FIELD PROPERTY_DELEGATE name:test3$delegate type:kotlin.collections.MutableMap visibility:private [final]' type=kotlin.collections.MutableMap origin=null receiver: GET_VAR ': .C declared in .C.' type=.C origin=null @@ -101,19 +101,19 @@ 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.TypeAliasesKt.HashMap } visibility:private [final,static] + FIELD PROPERTY_DELEGATE name:test4$delegate type:java.util.HashMap{ kotlin.collections.HashMap } visibility:private [final,static] EXPRESSION_BODY - CALL 'public final fun hashMapOf (): java.util.HashMap{ kotlin.collections.TypeAliasesKt.HashMap } [inline] declared in kotlin.collections.MapsKt' type=java.util.HashMap{ kotlin.collections.TypeAliasesKt.HashMap } origin=null + CALL 'public final fun hashMapOf (): java.util.HashMap{ kotlin.collections.HashMap } [inline] declared in kotlin.collections.MapsKt' type=java.util.HashMap{ kotlin.collections.HashMap } origin=null : kotlin.String : kotlin.Any FUN DELEGATED_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Any correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [delegated,var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Any declared in ' - CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V1 of kotlin.collections.MapAccessorsKt.getValue [inline,operator] declared in kotlin.collections.MapAccessorsKt' type=kotlin.Any origin=null + CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V1 of kotlin.collections.getValue [inline,operator] 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.TypeAliasesKt.HashMap } visibility:private [final,static]' type=java.util.HashMap{ kotlin.collections.TypeAliasesKt.HashMap } origin=null + $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 thisRef: CONST Null type=kotlin.Nothing? value=null property: PROPERTY_REFERENCE 'public final test4: kotlin.Any [delegated,var]' 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 @@ -121,9 +121,9 @@ FILE fqName: fileName:/delegatedProperties.kt VALUE_PARAMETER name: index:0 type:kotlin.Any BLOCK_BODY 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.MapAccessorsKt.setValue): kotlin.Unit [inline,operator] declared in kotlin.collections.MapAccessorsKt' type=kotlin.Unit origin=null + CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.collections.setValue): kotlin.Unit [inline,operator] 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.TypeAliasesKt.HashMap } visibility:private [final,static]' type=java.util.HashMap{ kotlin.collections.TypeAliasesKt.HashMap } origin=null + $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 thisRef: CONST Null type=kotlin.Nothing? value=null property: PROPERTY_REFERENCE 'public final test4: kotlin.Any [delegated,var]' 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/localDelegatedProperties.fir.ir.txt b/compiler/testData/ir/irText/declarations/localDelegatedProperties.fir.ir.txt index b5d907a265d..45443e9207e 100644 --- a/compiler/testData/ir/irText/declarations/localDelegatedProperties.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/localDelegatedProperties.fir.ir.txt @@ -18,7 +18,7 @@ FILE fqName: fileName:/localDelegatedProperties.kt $receiver: GET_VAR 'val x$delegate: kotlin.Lazy [val] declared in .test1' type=kotlin.Lazy origin=null thisRef: CONST Null type=kotlin.Nothing? value=null property: LOCAL_DELEGATED_PROPERTY_REFERENCE 'val x: kotlin.Int by (...)' delegate='val x$delegate: kotlin.Lazy [val] declared in .test1' getter='local final fun (): kotlin.Int declared in .test1' setter=null type=kotlin.reflect.KProperty0 origin=PROPERTY_REFERENCE_FOR_DELEGATE - CALL 'public final fun println (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: CALL 'local final fun (): kotlin.Int declared in .test1' type=kotlin.Int origin=GET_LOCAL_PROPERTY FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY @@ -30,7 +30,7 @@ FILE fqName: fileName:/localDelegatedProperties.kt FUN DELEGATED_PROPERTY_ACCESSOR name: visibility:local modality:FINAL <> () returnType:kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.Int declared in .test2' - CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V1 of kotlin.collections.MapAccessorsKt.getValue [inline,operator] declared in kotlin.collections.MapAccessorsKt' type=kotlin.Int origin=null + CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V1 of kotlin.collections.getValue [inline,operator] declared in kotlin.collections' type=kotlin.Int origin=null : kotlin.Int : kotlin.Int $receiver: GET_VAR 'val x$delegate: java.util.HashMap [val] declared in .test2' type=java.util.HashMap origin=null @@ -39,7 +39,7 @@ FILE fqName: fileName:/localDelegatedProperties.kt FUN DELEGATED_PROPERTY_ACCESSOR name: visibility:local modality:FINAL <> (:kotlin.Int) returnType:kotlin.Unit VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.collections.MapAccessorsKt.setValue): kotlin.Unit [inline,operator] declared in kotlin.collections.MapAccessorsKt' type=kotlin.Unit origin=null + CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.collections.setValue): kotlin.Unit [inline,operator] declared in kotlin.collections' type=kotlin.Unit origin=null : kotlin.Int $receiver: GET_VAR 'val x$delegate: java.util.HashMap [val] declared in .test2' type=java.util.HashMap origin=null thisRef: CONST Null type=kotlin.Nothing? value=null diff --git a/compiler/testData/ir/irText/declarations/localDelegatedProperties.ir.txt b/compiler/testData/ir/irText/declarations/localDelegatedProperties.ir.txt index 0697ccc57f5..7b5a2c530fb 100644 --- a/compiler/testData/ir/irText/declarations/localDelegatedProperties.ir.txt +++ b/compiler/testData/ir/irText/declarations/localDelegatedProperties.ir.txt @@ -18,33 +18,33 @@ FILE fqName: fileName:/localDelegatedProperties.kt $receiver: GET_VAR 'val x$delegate: kotlin.Lazy [val] declared in .test1' type=kotlin.Lazy origin=null thisRef: CONST Null type=kotlin.Nothing? value=null property: LOCAL_DELEGATED_PROPERTY_REFERENCE 'val x: kotlin.Int by (...)' delegate='val x$delegate: kotlin.Lazy [val] declared in .test1' getter='local final fun (): kotlin.Int declared in .test1' setter=null type=kotlin.reflect.KProperty0 origin=PROPERTY_REFERENCE_FOR_DELEGATE - CALL 'public final fun println (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: CALL 'local final fun (): kotlin.Int declared in .test1' type=kotlin.Int origin=GET_LOCAL_PROPERTY 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.TypeAliasesKt.HashMap } [val] - CALL 'public final fun hashMapOf (): java.util.HashMap{ kotlin.collections.TypeAliasesKt.HashMap } [inline] declared in kotlin.collections.MapsKt' type=java.util.HashMap{ kotlin.collections.TypeAliasesKt.HashMap } origin=null + 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 } [inline] declared in kotlin.collections.MapsKt' type=java.util.HashMap{ kotlin.collections.HashMap } origin=null : kotlin.String : kotlin.Int FUN DELEGATED_PROPERTY_ACCESSOR name: visibility:local modality:FINAL <> () returnType:kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='local final fun (): kotlin.Int declared in .test2' - CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V1 of kotlin.collections.MapAccessorsKt.getValue [inline,operator] declared in kotlin.collections.MapAccessorsKt' type=kotlin.Int origin=null + CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V1 of kotlin.collections.getValue [inline,operator] declared in kotlin.collections' type=kotlin.Int origin=null : kotlin.Int : kotlin.Int - $receiver: GET_VAR 'val x$delegate: java.util.HashMap{ kotlin.collections.TypeAliasesKt.HashMap } [val] declared in .test2' type=java.util.HashMap{ kotlin.collections.TypeAliasesKt.HashMap } origin=null + $receiver: GET_VAR 'val x$delegate: java.util.HashMap{ kotlin.collections.HashMap } [val] declared in .test2' type=java.util.HashMap{ kotlin.collections.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.TypeAliasesKt.HashMap } [val] 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{ kotlin.collections.HashMap } [val] 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.MapAccessorsKt.setValue): kotlin.Unit [inline,operator] declared in kotlin.collections.MapAccessorsKt' type=kotlin.Unit origin=null + CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.collections.setValue): kotlin.Unit [inline,operator] declared in kotlin.collections' type=kotlin.Unit origin=null : kotlin.Int - $receiver: GET_VAR 'val x$delegate: java.util.HashMap{ kotlin.collections.TypeAliasesKt.HashMap } [val] declared in .test2' type=java.util.HashMap{ kotlin.collections.TypeAliasesKt.HashMap } origin=null + $receiver: GET_VAR 'val x$delegate: java.util.HashMap{ kotlin.collections.HashMap } [val] declared in .test2' type=java.util.HashMap{ kotlin.collections.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.TypeAliasesKt.HashMap } [val] 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{ kotlin.collections.HashMap } [val] 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.fir.ir.txt b/compiler/testData/ir/irText/declarations/packageLevelProperties.fir.ir.txt index 25469e28d1c..5c539ad8e62 100644 --- a/compiler/testData/ir/irText/declarations/packageLevelProperties.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/packageLevelProperties.fir.ir.txt @@ -97,7 +97,7 @@ FILE fqName: fileName:/packageLevelProperties.kt correspondingProperty: PROPERTY name:test8 visibility:public modality:FINAL [delegated,var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V1 of kotlin.collections.MapAccessorsKt.getValue [inline,operator] declared in kotlin.collections.MapAccessorsKt' type=kotlin.Int origin=null + CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V1 of kotlin.collections.getValue [inline,operator] 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 visibility:private [final,static]' type=java.util.HashMap origin=null @@ -107,7 +107,7 @@ FILE fqName: fileName:/packageLevelProperties.kt correspondingProperty: PROPERTY name:test8 visibility:public modality:FINAL [delegated,var] VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY - CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.collections.MapAccessorsKt.setValue): kotlin.Unit [inline,operator] declared in kotlin.collections.MapAccessorsKt' type=kotlin.Unit origin=null + CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.collections.setValue): kotlin.Unit [inline,operator] declared in kotlin.collections' type=kotlin.Unit origin=null : kotlin.Int $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 diff --git a/compiler/testData/ir/irText/declarations/packageLevelProperties.ir.txt b/compiler/testData/ir/irText/declarations/packageLevelProperties.ir.txt index bb83755b223..46ea614940d 100644 --- a/compiler/testData/ir/irText/declarations/packageLevelProperties.ir.txt +++ b/compiler/testData/ir/irText/declarations/packageLevelProperties.ir.txt @@ -88,19 +88,19 @@ FILE fqName: fileName:/packageLevelProperties.kt thisRef: CONST Null type=kotlin.Nothing? value=null property: PROPERTY_REFERENCE 'public final test7: kotlin.Int [delegated,val]' 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.TypeAliasesKt.HashMap } visibility:private [final,static] + FIELD PROPERTY_DELEGATE name:test8$delegate type:java.util.HashMap{ kotlin.collections.HashMap } visibility:private [final,static] EXPRESSION_BODY - CALL 'public final fun hashMapOf (): java.util.HashMap{ kotlin.collections.TypeAliasesKt.HashMap } [inline] declared in kotlin.collections.MapsKt' type=java.util.HashMap{ kotlin.collections.TypeAliasesKt.HashMap } origin=null + CALL 'public final fun hashMapOf (): java.util.HashMap{ kotlin.collections.HashMap } [inline] declared in kotlin.collections.MapsKt' type=java.util.HashMap{ kotlin.collections.HashMap } origin=null : kotlin.String : kotlin.Int FUN DELEGATED_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Int correspondingProperty: PROPERTY name:test8 visibility:public modality:FINAL [delegated,var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): kotlin.Int declared in ' - CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V1 of kotlin.collections.MapAccessorsKt.getValue [inline,operator] declared in kotlin.collections.MapAccessorsKt' type=kotlin.Int origin=null + CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V1 of kotlin.collections.getValue [inline,operator] 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.TypeAliasesKt.HashMap } visibility:private [final,static]' type=java.util.HashMap{ kotlin.collections.TypeAliasesKt.HashMap } origin=null + $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 thisRef: CONST Null type=kotlin.Nothing? value=null property: PROPERTY_REFERENCE 'public final test8: kotlin.Int [delegated,var]' 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 @@ -108,9 +108,9 @@ FILE fqName: fileName:/packageLevelProperties.kt VALUE_PARAMETER name: index:0 type:kotlin.Int BLOCK_BODY 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.MapAccessorsKt.setValue): kotlin.Unit [inline,operator] declared in kotlin.collections.MapAccessorsKt' type=kotlin.Unit origin=null + CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.collections.setValue): kotlin.Unit [inline,operator] 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.TypeAliasesKt.HashMap } visibility:private [final,static]' type=java.util.HashMap{ kotlin.collections.TypeAliasesKt.HashMap } origin=null + $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 thisRef: CONST Null type=kotlin.Nothing? value=null property: PROPERTY_REFERENCE 'public final test8: kotlin.Int [delegated,var]' 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 d1942b6a6fd..b6b6fa4b19f 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.TypeAliasesKt.Exception } [val] declared in .box - VAR CATCH_PARAMETER name:e type:java.lang.Exception{ kotlin.TypeAliasesKt.Exception } [val] + CATCH parameter=val e: java.lang.Exception{ kotlin.Exception } [val] declared in .box + VAR CATCH_PARAMETER name:e type:java.lang.Exception{ kotlin.Exception } [val] BLOCK type=kotlin.Unit origin=null SET_VAR 'var result: kotlin.String [var] declared in .box' type=kotlin.Unit origin=EQ CONST String type=kotlin.String value="OK" diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/javaDelegate.fir.ir.txt b/compiler/testData/ir/irText/declarations/provideDelegate/javaDelegate.fir.ir.txt index 51c32a61f6f..ebc177f1e14 100644 --- a/compiler/testData/ir/irText/declarations/provideDelegate/javaDelegate.fir.ir.txt +++ b/compiler/testData/ir/irText/declarations/provideDelegate/javaDelegate.fir.ir.txt @@ -8,7 +8,7 @@ FILE fqName:k fileName:/box.kt correspondingProperty: PROPERTY name:p1 visibility:public modality:FINAL [delegated,var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): @[FlexibleNullability] kotlin.String? declared in k' - CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V of kotlin.PropertyReferenceDelegatesKt.getValue [inline,operator] declared in kotlin.PropertyReferenceDelegatesKt' type=@[FlexibleNullability] kotlin.String? origin=null + CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V of kotlin.getValue [inline,operator] declared in kotlin' type=@[FlexibleNullability] kotlin.String? origin=null : @[FlexibleNullability] kotlin.String? $receiver: GET_FIELD 'FIELD PROPERTY_DELEGATE name:p1$delegate type:kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> visibility:private [final,static]' type=kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> origin=null thisRef: CONST Null type=kotlin.Nothing? value=null @@ -17,7 +17,7 @@ FILE fqName:k fileName:/box.kt correspondingProperty: PROPERTY name:p1 visibility:public modality:FINAL [delegated,var] VALUE_PARAMETER name: index:0 type:@[FlexibleNullability] kotlin.String? BLOCK_BODY - CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.PropertyReferenceDelegatesKt.setValue): kotlin.Unit [inline,operator] declared in kotlin.PropertyReferenceDelegatesKt' type=kotlin.Unit origin=null + CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.setValue): kotlin.Unit [inline,operator] declared in kotlin' type=kotlin.Unit origin=null : @[FlexibleNullability] kotlin.String? $receiver: GET_FIELD 'FIELD PROPERTY_DELEGATE name:p1$delegate type:kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> visibility:private [final,static]' type=kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> origin=null thisRef: CONST Null type=kotlin.Nothing? value=null @@ -32,7 +32,7 @@ FILE fqName:k fileName:/box.kt correspondingProperty: PROPERTY name:p2 visibility:public modality:FINAL [delegated,var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): @[FlexibleNullability] kotlin.String? declared in k' - CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V of kotlin.PropertyReferenceDelegatesKt.getValue [inline,operator] declared in kotlin.PropertyReferenceDelegatesKt' type=@[FlexibleNullability] kotlin.String? origin=null + CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V of kotlin.getValue [inline,operator] declared in kotlin' type=@[FlexibleNullability] kotlin.String? origin=null : @[FlexibleNullability] kotlin.String? $receiver: GET_FIELD 'FIELD PROPERTY_DELEGATE name:p2$delegate type:kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> visibility:private [final,static]' type=kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> origin=null thisRef: CONST Null type=kotlin.Nothing? value=null @@ -41,7 +41,7 @@ FILE fqName:k fileName:/box.kt correspondingProperty: PROPERTY name:p2 visibility:public modality:FINAL [delegated,var] VALUE_PARAMETER name: index:0 type:@[FlexibleNullability] kotlin.String? BLOCK_BODY - CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.PropertyReferenceDelegatesKt.setValue): kotlin.Unit [inline,operator] declared in kotlin.PropertyReferenceDelegatesKt' type=kotlin.Unit origin=null + CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.setValue): kotlin.Unit [inline,operator] declared in kotlin' type=kotlin.Unit origin=null : @[FlexibleNullability] kotlin.String? $receiver: GET_FIELD 'FIELD PROPERTY_DELEGATE name:p2$delegate type:kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> visibility:private [final,static]' type=kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> origin=null thisRef: CONST Null type=kotlin.Nothing? value=null diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/javaDelegate.ir.txt b/compiler/testData/ir/irText/declarations/provideDelegate/javaDelegate.ir.txt index 351f7b388a3..2fdd9dc3a60 100644 --- a/compiler/testData/ir/irText/declarations/provideDelegate/javaDelegate.ir.txt +++ b/compiler/testData/ir/irText/declarations/provideDelegate/javaDelegate.ir.txt @@ -8,7 +8,7 @@ FILE fqName:k fileName:/box.kt correspondingProperty: PROPERTY name:p1 visibility:public modality:FINAL [delegated,var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): @[FlexibleNullability] kotlin.String? declared in k' - CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V of kotlin.PropertyReferenceDelegatesKt.getValue [inline,operator] declared in kotlin.PropertyReferenceDelegatesKt' type=@[FlexibleNullability] kotlin.String? origin=null + CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V of kotlin.getValue [inline,operator] declared in kotlin' type=@[FlexibleNullability] kotlin.String? origin=null : @[FlexibleNullability] kotlin.String? $receiver: GET_FIELD 'FIELD PROPERTY_DELEGATE name:p1$delegate type:kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> visibility:private [final,static]' type=kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> origin=null thisRef: CONST Null type=kotlin.Nothing? value=null @@ -18,7 +18,7 @@ FILE fqName:k fileName:/box.kt VALUE_PARAMETER name: index:0 type:@[FlexibleNullability] kotlin.String? BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in k' - CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.PropertyReferenceDelegatesKt.setValue): kotlin.Unit [inline,operator] declared in kotlin.PropertyReferenceDelegatesKt' type=kotlin.Unit origin=null + CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.setValue): kotlin.Unit [inline,operator] declared in kotlin' type=kotlin.Unit origin=null : @[FlexibleNullability] kotlin.String? $receiver: GET_FIELD 'FIELD PROPERTY_DELEGATE name:p1$delegate type:kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> visibility:private [final,static]' type=kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> origin=null thisRef: CONST Null type=kotlin.Nothing? value=null @@ -33,7 +33,7 @@ FILE fqName:k fileName:/box.kt correspondingProperty: PROPERTY name:p2 visibility:public modality:FINAL [delegated,var] BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (): @[FlexibleNullability] kotlin.String? declared in k' - CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V of kotlin.PropertyReferenceDelegatesKt.getValue [inline,operator] declared in kotlin.PropertyReferenceDelegatesKt' type=@[FlexibleNullability] kotlin.String? origin=null + CALL 'public final fun getValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): V of kotlin.getValue [inline,operator] declared in kotlin' type=@[FlexibleNullability] kotlin.String? origin=null : @[FlexibleNullability] kotlin.String? $receiver: GET_FIELD 'FIELD PROPERTY_DELEGATE name:p2$delegate type:kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> visibility:private [final,static]' type=kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> origin=null thisRef: CONST Null type=kotlin.Nothing? value=null @@ -43,7 +43,7 @@ FILE fqName:k fileName:/box.kt VALUE_PARAMETER name: index:0 type:@[FlexibleNullability] kotlin.String? BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun (: @[FlexibleNullability] kotlin.String?): kotlin.Unit declared in k' - CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.PropertyReferenceDelegatesKt.setValue): kotlin.Unit [inline,operator] declared in kotlin.PropertyReferenceDelegatesKt' type=kotlin.Unit origin=null + CALL 'public final fun setValue (thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: V of kotlin.setValue): kotlin.Unit [inline,operator] declared in kotlin' type=kotlin.Unit origin=null : @[FlexibleNullability] kotlin.String? $receiver: GET_FIELD 'FIELD PROPERTY_DELEGATE name:p2$delegate type:kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> visibility:private [final,static]' type=kotlin.reflect.KMutableProperty0<@[FlexibleNullability] kotlin.String?> origin=null thisRef: CONST Null type=kotlin.Nothing? value=null diff --git a/compiler/testData/ir/irText/expressions/catchParameterAccess.ir.txt b/compiler/testData/ir/irText/expressions/catchParameterAccess.ir.txt index 5ca5f24f85c..a374b4a9724 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 [operator] 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.TypeAliasesKt.Exception } [val] declared in .test - VAR CATCH_PARAMETER name:e type:java.lang.Exception{ kotlin.TypeAliasesKt.Exception } [val] + CATCH parameter=val e: java.lang.Exception{ kotlin.Exception } [val] declared in .test + VAR CATCH_PARAMETER name:e type:java.lang.Exception{ kotlin.Exception } [val] BLOCK type=kotlin.Nothing origin=null THROW type=kotlin.Nothing - GET_VAR 'val e: java.lang.Exception{ kotlin.TypeAliasesKt.Exception } [val] declared in .test' type=java.lang.Exception{ kotlin.TypeAliasesKt.Exception } origin=null + GET_VAR 'val e: java.lang.Exception{ kotlin.Exception } [val] declared in .test' type=java.lang.Exception{ kotlin.Exception } origin=null diff --git a/compiler/testData/ir/irText/expressions/classReference.ir.txt b/compiler/testData/ir/irText/expressions/classReference.ir.txt index 3c6ec7a025a..cadd4a41df2 100644 --- a/compiler/testData/ir/irText/expressions/classReference.ir.txt +++ b/compiler/testData/ir/irText/expressions/classReference.ir.txt @@ -26,11 +26,11 @@ FILE fqName: fileName:/classReference.kt GET_CLASS type=kotlin.reflect.KClass.A> CONSTRUCTOR_CALL 'public constructor () [primary] declared in .A' type=.A origin=null TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - CALL 'public final fun (): java.lang.Class> declared in kotlin.jvm.JvmClassMappingKt' type=java.lang.Class<.A> origin=GET_PROPERTY + CALL 'public final fun (): java.lang.Class> declared in kotlin.jvm' type=java.lang.Class<.A> origin=GET_PROPERTY : .A $receiver: CLASS_REFERENCE 'CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass<.A> TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - CALL 'public final fun (): java.lang.Class> declared in kotlin.jvm.JvmClassMappingKt' type=java.lang.Class.A> origin=GET_PROPERTY + CALL 'public final fun (): java.lang.Class> declared in kotlin.jvm' type=java.lang.Class.A> origin=GET_PROPERTY : .A $receiver: GET_CLASS type=kotlin.reflect.KClass.A> CONSTRUCTOR_CALL 'public constructor () [primary] declared in .A' type=.A origin=null diff --git a/compiler/testData/ir/irText/expressions/for.fir.ir.txt b/compiler/testData/ir/irText/expressions/for.fir.ir.txt index 7d1da58e62c..328bdc16ee0 100644 --- a/compiler/testData/ir/irText/expressions/for.fir.ir.txt +++ b/compiler/testData/ir/irText/expressions/for.fir.ir.txt @@ -28,7 +28,7 @@ FILE fqName: fileName:/for.kt VAR FOR_LOOP_VARIABLE name:s type:kotlin.String [val] CALL 'public abstract fun next (): T of kotlin.collections.Iterator [operator] declared in kotlin.collections.Iterator' type=kotlin.String origin=FOR_LOOP_NEXT $this: GET_VAR 'val tmp_1: kotlin.collections.Iterator [val] declared in .testIterable' type=kotlin.collections.Iterator origin=null - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: GET_VAR 'val s: kotlin.String [val] declared in .testIterable' type=kotlin.String origin=null FUN name:testDestructuring visibility:public modality:FINAL <> (pp:kotlin.collections.List>) returnType:kotlin.Unit VALUE_PARAMETER name:pp index:0 type:kotlin.collections.List> @@ -51,9 +51,9 @@ FILE fqName: fileName:/for.kt CALL 'public final fun component2 (): B of kotlin.Pair [operator] declared in kotlin.Pair' type=kotlin.String origin=COMPONENT_N(index=2) $this: GET_VAR 'val tmp_3: kotlin.Pair [val] declared in .testDestructuring' type=kotlin.Pair origin=null BLOCK type=kotlin.Unit origin=null - CALL 'public final fun println (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: GET_VAR 'val i: kotlin.Int [val] declared in .testDestructuring' type=kotlin.Int origin=null - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: GET_VAR 'val s: kotlin.String [val] declared in .testDestructuring' type=kotlin.String origin=null FUN name:testRange visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY diff --git a/compiler/testData/ir/irText/expressions/for.ir.txt b/compiler/testData/ir/irText/expressions/for.ir.txt index 7565f741ad9..94209d7c2a8 100644 --- a/compiler/testData/ir/irText/expressions/for.ir.txt +++ b/compiler/testData/ir/irText/expressions/for.ir.txt @@ -28,7 +28,7 @@ FILE fqName: fileName:/for.kt CALL 'public abstract fun next (): T of kotlin.collections.Iterator [operator] declared in kotlin.collections.Iterator' type=kotlin.String origin=FOR_LOOP_NEXT $this: GET_VAR 'val tmp_1: kotlin.collections.Iterator [val] declared in .testIterable' type=kotlin.collections.Iterator origin=null BLOCK type=kotlin.Unit origin=null - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: GET_VAR 'val s: kotlin.String [val] declared in .testIterable' type=kotlin.String origin=null FUN name:testDestructuring visibility:public modality:FINAL <> (pp:kotlin.collections.List>) returnType:kotlin.Unit VALUE_PARAMETER name:pp index:0 type:kotlin.collections.List> @@ -51,9 +51,9 @@ FILE fqName: fileName:/for.kt CALL 'public final fun component2 (): B of kotlin.Pair [operator] declared in kotlin.Pair' type=kotlin.String origin=COMPONENT_N(index=2) $this: GET_VAR 'val tmp_3: kotlin.Pair [val] declared in .testDestructuring' type=kotlin.Pair origin=null BLOCK type=kotlin.Unit origin=null - CALL 'public final fun println (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: GET_VAR 'val i: kotlin.Int [val] declared in .testDestructuring' type=kotlin.Int origin=null - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: GET_VAR 'val s: kotlin.String [val] declared in .testDestructuring' type=kotlin.String origin=null FUN name:testRange visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY diff --git a/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.fir.ir.txt b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.fir.ir.txt index 82669b03cfe..bc9283259c8 100644 --- a/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.fir.ir.txt +++ b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.fir.ir.txt @@ -119,5 +119,5 @@ FILE fqName: fileName:/forWithImplicitReceivers.kt CALL 'public open fun next (): kotlin.Int [operator] declared in .IReceiver' type=kotlin.Int origin=null $this: GET_VAR ': .IReceiver declared in .test' type=.IReceiver origin=null $receiver: GET_VAR 'val tmp_1: .IntCell [val] declared in .test' type=.IntCell origin=null - CALL 'public final fun println (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: GET_VAR 'val i: kotlin.Int [val] declared in .test' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.ir.txt b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.ir.txt index 3e539c09cbf..b1a5be3e576 100644 --- a/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.ir.txt +++ b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.ir.txt @@ -123,5 +123,5 @@ FILE fqName: fileName:/forWithImplicitReceivers.kt $this: GET_VAR ': .IReceiver declared in .test' type=.IReceiver origin=null $receiver: GET_VAR 'val tmp_2: .IntCell [val] declared in .test' type=.IntCell origin=null BLOCK type=kotlin.Unit origin=null - CALL 'public final fun println (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: GET_VAR 'val i: kotlin.Int [val] declared in .test' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/expressions/kt48806.ir.txt b/compiler/testData/ir/irText/expressions/kt48806.ir.txt index e8c2cc1867d..35c78aae4e2 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.TypeAliasesKt.Exception } [val] declared in .A.test_1 - VAR CATCH_PARAMETER name:e type:java.lang.Exception{ kotlin.TypeAliasesKt.Exception } [val] + CATCH parameter=val e: java.lang.Exception{ kotlin.Exception } [val] declared in .A.test_1 + VAR CATCH_PARAMETER name:e type:java.lang.Exception{ kotlin.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.TypeAliasesKt.Exception } [val] declared in .A.test_2 - VAR CATCH_PARAMETER name:e type:java.lang.Exception{ kotlin.TypeAliasesKt.Exception } [val] + CATCH parameter=val e: java.lang.Exception{ kotlin.Exception } [val] declared in .A.test_2 + VAR CATCH_PARAMETER name:e type:java.lang.Exception{ kotlin.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/objectClassReference.ir.txt b/compiler/testData/ir/irText/expressions/objectClassReference.ir.txt index f8e65241d75..82a6c36104c 100644 --- a/compiler/testData/ir/irText/expressions/objectClassReference.ir.txt +++ b/compiler/testData/ir/irText/expressions/objectClassReference.ir.txt @@ -23,6 +23,6 @@ FILE fqName: fileName:/objectClassReference.kt TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit CLASS_REFERENCE 'CLASS OBJECT name:A modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass<.A> TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit - CALL 'public final fun (): java.lang.Class> declared in kotlin.jvm.JvmClassMappingKt' type=java.lang.Class<.A> origin=GET_PROPERTY + CALL 'public final fun (): java.lang.Class> declared in kotlin.jvm' type=java.lang.Class<.A> origin=GET_PROPERTY : .A $receiver: CLASS_REFERENCE 'CLASS OBJECT name:A modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.reflect.KClass<.A> diff --git a/compiler/testData/ir/irText/expressions/signedToUnsignedConversions.fir.ir.txt b/compiler/testData/ir/irText/expressions/signedToUnsignedConversions.fir.ir.txt index b54716b5dbc..4076e86d700 100644 --- a/compiler/testData/ir/irText/expressions/signedToUnsignedConversions.fir.ir.txt +++ b/compiler/testData/ir/irText/expressions/signedToUnsignedConversions.fir.ir.txt @@ -118,27 +118,27 @@ FILE fqName: fileName:/signedToUnsignedConversions_test.kt FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY CALL 'public final fun takeUByte (u: kotlin.UByte): kotlin.Unit declared in ' type=kotlin.Unit origin=null - u: CALL 'public final fun toUByte (): kotlin.UByte [inline] declared in kotlin.UByteKt' type=kotlin.UByte origin=null + u: CALL 'public final fun toUByte (): kotlin.UByte [inline] declared in kotlin' type=kotlin.UByte origin=null $receiver: CONST Int type=kotlin.Int value=255 CALL 'public final fun takeUByte (u: kotlin.UByte): kotlin.Unit declared in ' type=kotlin.Unit origin=null - u: CALL 'public final fun toUByte (): kotlin.UByte [inline] declared in kotlin.UByteKt' type=kotlin.UByte origin=null + u: CALL 'public final fun toUByte (): kotlin.UByte [inline] declared in kotlin' type=kotlin.UByte origin=null $receiver: CONST Int type=kotlin.Int value=255 CALL 'public final fun takeUShort (u: kotlin.UShort): kotlin.Unit declared in ' type=kotlin.Unit origin=null - u: CALL 'public final fun toUShort (): kotlin.UShort [inline] declared in kotlin.UShortKt' type=kotlin.UShort origin=null + u: CALL 'public final fun toUShort (): kotlin.UShort [inline] declared in kotlin' type=kotlin.UShort origin=null $receiver: CONST Int type=kotlin.Int value=255 CALL 'public final fun takeUShort (u: kotlin.UShort): kotlin.Unit declared in ' type=kotlin.Unit origin=null - u: CALL 'public final fun toUShort (): kotlin.UShort [inline] declared in kotlin.UShortKt' type=kotlin.UShort origin=null + u: CALL 'public final fun toUShort (): kotlin.UShort [inline] declared in kotlin' type=kotlin.UShort origin=null $receiver: CONST Int type=kotlin.Int value=256 CALL 'public final fun takeUInt (u: kotlin.UInt): kotlin.Unit declared in ' type=kotlin.Unit origin=null - u: CALL 'public final fun toUInt (): kotlin.UInt [inline] declared in kotlin.UIntKt' type=kotlin.UInt origin=null + u: CALL 'public final fun toUInt (): kotlin.UInt [inline] declared in kotlin' type=kotlin.UInt origin=null $receiver: CONST Int type=kotlin.Int value=255 CALL 'public final fun takeULong (u: kotlin.ULong): kotlin.Unit declared in ' type=kotlin.Unit origin=null - u: CALL 'public final fun toULong (): kotlin.ULong [inline] declared in kotlin.ULongKt' type=kotlin.ULong origin=null + u: CALL 'public final fun toULong (): kotlin.ULong [inline] declared in kotlin' type=kotlin.ULong origin=null $receiver: CONST Int type=kotlin.Int value=255 CALL 'public final fun takeUBytes (vararg u: kotlin.UByte): kotlin.Unit declared in ' type=kotlin.Unit origin=null u: VARARG type=kotlin.UByteArray varargElementType=kotlin.UByte - CALL 'public final fun toUByte (): kotlin.UByte [inline] declared in kotlin.UByteKt' type=kotlin.UByte origin=null + CALL 'public final fun toUByte (): kotlin.UByte [inline] declared in kotlin' type=kotlin.UByte origin=null $receiver: CONST Int type=kotlin.Int value=255 - CALL 'public final fun toUByte (): kotlin.UByte [inline] declared in kotlin.UByteKt' type=kotlin.UByte origin=null + CALL 'public final fun toUByte (): kotlin.UByte [inline] declared in kotlin' type=kotlin.UByte origin=null $receiver: CONST Int type=kotlin.Int value=255 CONST Byte type=kotlin.UByte value=42 diff --git a/compiler/testData/ir/irText/expressions/signedToUnsignedConversions.ir.txt b/compiler/testData/ir/irText/expressions/signedToUnsignedConversions.ir.txt index c39c3b00880..f2578a03b18 100644 --- a/compiler/testData/ir/irText/expressions/signedToUnsignedConversions.ir.txt +++ b/compiler/testData/ir/irText/expressions/signedToUnsignedConversions.ir.txt @@ -118,27 +118,27 @@ FILE fqName: fileName:/signedToUnsignedConversions_test.kt FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY CALL 'public final fun takeUByte (u: kotlin.UByte): kotlin.Unit declared in ' type=kotlin.Unit origin=null - u: CALL 'public final fun toUByte (): kotlin.UByte [inline] declared in kotlin.UByteKt' type=kotlin.UByte origin=null + u: CALL 'public final fun toUByte (): kotlin.UByte [inline] declared in kotlin' type=kotlin.UByte origin=null $receiver: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY CALL 'public final fun takeUByte (u: kotlin.UByte): kotlin.Unit declared in ' type=kotlin.Unit origin=null - u: CALL 'public final fun toUByte (): kotlin.UByte [inline] declared in kotlin.UByteKt' type=kotlin.UByte origin=null + u: CALL 'public final fun toUByte (): kotlin.UByte [inline] declared in kotlin' type=kotlin.UByte origin=null $receiver: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY CALL 'public final fun takeUShort (u: kotlin.UShort): kotlin.Unit declared in ' type=kotlin.Unit origin=null - u: CALL 'public final fun toUShort (): kotlin.UShort [inline] declared in kotlin.UShortKt' type=kotlin.UShort origin=null + u: CALL 'public final fun toUShort (): kotlin.UShort [inline] declared in kotlin' type=kotlin.UShort origin=null $receiver: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY CALL 'public final fun takeUShort (u: kotlin.UShort): kotlin.Unit declared in ' type=kotlin.Unit origin=null - u: CALL 'public final fun toUShort (): kotlin.UShort [inline] declared in kotlin.UShortKt' type=kotlin.UShort origin=null + u: CALL 'public final fun toUShort (): kotlin.UShort [inline] declared in kotlin' type=kotlin.UShort origin=null $receiver: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY CALL 'public final fun takeUInt (u: kotlin.UInt): kotlin.Unit declared in ' type=kotlin.Unit origin=null - u: CALL 'public final fun toUInt (): kotlin.UInt [inline] declared in kotlin.UIntKt' type=kotlin.UInt origin=null + u: CALL 'public final fun toUInt (): kotlin.UInt [inline] declared in kotlin' type=kotlin.UInt origin=null $receiver: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY CALL 'public final fun takeULong (u: kotlin.ULong): kotlin.Unit declared in ' type=kotlin.Unit origin=null - u: CALL 'public final fun toULong (): kotlin.ULong [inline] declared in kotlin.ULongKt' type=kotlin.ULong origin=null + u: CALL 'public final fun toULong (): kotlin.ULong [inline] declared in kotlin' type=kotlin.ULong origin=null $receiver: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY CALL 'public final fun takeUBytes (vararg u: kotlin.UByte): kotlin.Unit declared in ' type=kotlin.Unit origin=null u: VARARG type=kotlin.UByteArray varargElementType=kotlin.UByte - CALL 'public final fun toUByte (): kotlin.UByte [inline] declared in kotlin.UByteKt' type=kotlin.UByte origin=null + CALL 'public final fun toUByte (): kotlin.UByte [inline] declared in kotlin' type=kotlin.UByte origin=null $receiver: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY - CALL 'public final fun toUByte (): kotlin.UByte [inline] declared in kotlin.UByteKt' type=kotlin.UByte origin=null + CALL 'public final fun toUByte (): kotlin.UByte [inline] declared in kotlin' type=kotlin.UByte origin=null $receiver: CALL 'public final fun (): kotlin.Int declared in ' type=kotlin.Int origin=GET_PROPERTY CONST Byte type=kotlin.UByte value=42 diff --git a/compiler/testData/ir/irText/expressions/signedToUnsignedConversions.kt b/compiler/testData/ir/irText/expressions/signedToUnsignedConversions.kt index 324ea7fd039..a020f2302e2 100644 --- a/compiler/testData/ir/irText/expressions/signedToUnsignedConversions.kt +++ b/compiler/testData/ir/irText/expressions/signedToUnsignedConversions.kt @@ -1,8 +1,9 @@ // WITH_STDLIB -// IGNORE_BACKEND: JS_IR -// IGNORE_BACKEND: JS_IR_ES6 // !LANGUAGE: +ImplicitSignedToUnsignedIntegerConversion +// MUTE_SIGNATURE_COMPARISON_K2: JS_IR +// ^ KT-57818 + // FILE: signedToUnsignedConversions_annotation.kt package kotlin.internal diff --git a/compiler/testData/ir/irText/expressions/smartCasts.ir.txt b/compiler/testData/ir/irText/expressions/smartCasts.ir.txt index 65d595a93d7..54a52534b88 100644 --- a/compiler/testData/ir/irText/expressions/smartCasts.ir.txt +++ b/compiler/testData/ir/irText/expressions/smartCasts.ir.txt @@ -24,7 +24,7 @@ FILE fqName: fileName:/smartCasts.kt GET_VAR 'x: kotlin.Any declared in .test1' type=kotlin.Any origin=null then: RETURN type=kotlin.Nothing from='public final fun test1 (x: kotlin.Any): kotlin.Unit declared in ' GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit - CALL 'public final fun println (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: CALL 'public open fun (): kotlin.Int declared in kotlin.String' type=kotlin.Int origin=GET_PROPERTY $this: TYPE_OP type=kotlin.String origin=IMPLICIT_CAST typeOperand=kotlin.String GET_VAR 'x: kotlin.Any declared in .test1' type=kotlin.Any origin=null diff --git a/compiler/testData/ir/irText/expressions/tryCatch.fir.ir.txt b/compiler/testData/ir/irText/expressions/tryCatch.fir.ir.txt index e5585dec7a6..6c352a04f01 100644 --- a/compiler/testData/ir/irText/expressions/tryCatch.fir.ir.txt +++ b/compiler/testData/ir/irText/expressions/tryCatch.fir.ir.txt @@ -3,25 +3,25 @@ FILE fqName: fileName:/tryCatch.kt BLOCK_BODY TRY type=kotlin.Unit try: BLOCK type=kotlin.Unit origin=null - CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null CATCH parameter=val e: kotlin.Throwable [val] declared in .test1 VAR CATCH_PARAMETER name:e type:kotlin.Throwable [val] BLOCK type=kotlin.Unit origin=null - CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null finally: BLOCK type=kotlin.Unit origin=null - CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test2 (): kotlin.Int declared in ' TRY type=kotlin.Int try: BLOCK type=kotlin.Int origin=null - CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null CONST Int type=kotlin.Int value=42 CATCH parameter=val e: kotlin.Throwable [val] declared in .test2 VAR CATCH_PARAMETER name:e type:kotlin.Throwable [val] BLOCK type=kotlin.Int origin=null - CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null CONST Int type=kotlin.Int value=24 finally: BLOCK type=kotlin.Int origin=null - CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null CONST Int type=kotlin.Int value=555 diff --git a/compiler/testData/ir/irText/expressions/tryCatch.ir.txt b/compiler/testData/ir/irText/expressions/tryCatch.ir.txt index 16a3e71769d..241dc83315b 100644 --- a/compiler/testData/ir/irText/expressions/tryCatch.ir.txt +++ b/compiler/testData/ir/irText/expressions/tryCatch.ir.txt @@ -3,26 +3,26 @@ FILE fqName: fileName:/tryCatch.kt BLOCK_BODY TRY type=kotlin.Unit try: BLOCK type=kotlin.Unit origin=null - CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null CATCH parameter=val e: kotlin.Throwable [val] declared in .test1 VAR CATCH_PARAMETER name:e type:kotlin.Throwable [val] BLOCK type=kotlin.Unit origin=null - CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null finally: BLOCK type=kotlin.Unit origin=null - CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Int BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun test2 (): kotlin.Int declared in ' TRY type=kotlin.Int try: BLOCK type=kotlin.Int origin=null - CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null CONST Int type=kotlin.Int value=42 CATCH parameter=val e: kotlin.Throwable [val] declared in .test2 VAR CATCH_PARAMETER name:e type:kotlin.Throwable [val] BLOCK type=kotlin.Int origin=null - CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null CONST Int type=kotlin.Int value=24 finally: BLOCK type=kotlin.Unit origin=null - CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null TYPE_OP type=kotlin.Unit origin=IMPLICIT_COERCION_TO_UNIT typeOperand=kotlin.Unit CONST Int type=kotlin.Int value=555 diff --git a/compiler/testData/ir/irText/expressions/typeArguments.ir.txt b/compiler/testData/ir/irText/expressions/typeArguments.ir.txt index 78ee6827b4b..411e591baff 100644 --- a/compiler/testData/ir/irText/expressions/typeArguments.ir.txt +++ b/compiler/testData/ir/irText/expressions/typeArguments.ir.txt @@ -7,7 +7,7 @@ FILE fqName: fileName:/typeArguments.kt BRANCH if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=kotlin.Array<*> GET_VAR 'x: kotlin.Any declared in .test1' type=kotlin.Any origin=null - then: CALL 'public final fun isArrayOf (): kotlin.Boolean declared in kotlin.jvm.JvmClassMappingKt' type=kotlin.Boolean origin=null + then: CALL 'public final fun isArrayOf (): kotlin.Boolean declared in kotlin.jvm' type=kotlin.Boolean origin=null : kotlin.String $receiver: TYPE_OP type=kotlin.Array<*> origin=IMPLICIT_CAST typeOperand=kotlin.Array<*> GET_VAR 'x: kotlin.Any declared in .test1' type=kotlin.Any origin=null diff --git a/compiler/testData/ir/irText/expressions/unsignedIntegerLiterals.ir.txt b/compiler/testData/ir/irText/expressions/unsignedIntegerLiterals.ir.txt index f1e428d0095..e9df54cd4c5 100644 --- a/compiler/testData/ir/irText/expressions/unsignedIntegerLiterals.ir.txt +++ b/compiler/testData/ir/irText/expressions/unsignedIntegerLiterals.ir.txt @@ -56,7 +56,7 @@ FILE fqName: fileName:/unsignedIntegerLiterals.kt PROPERTY name:testToUByte visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:testToUByte type:kotlin.UByte visibility:private [final,static] EXPRESSION_BODY - CALL 'public final fun toUByte (): kotlin.UByte [inline] declared in kotlin.UByteKt' type=kotlin.UByte origin=null + CALL 'public final fun toUByte (): kotlin.UByte [inline] declared in kotlin' type=kotlin.UByte origin=null $receiver: CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.UByte correspondingProperty: PROPERTY name:testToUByte visibility:public modality:FINAL [val] @@ -66,7 +66,7 @@ FILE fqName: fileName:/unsignedIntegerLiterals.kt PROPERTY name:testToUShort visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:testToUShort type:kotlin.UShort visibility:private [final,static] EXPRESSION_BODY - CALL 'public final fun toUShort (): kotlin.UShort [inline] declared in kotlin.UShortKt' type=kotlin.UShort origin=null + CALL 'public final fun toUShort (): kotlin.UShort [inline] declared in kotlin' type=kotlin.UShort origin=null $receiver: CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.UShort correspondingProperty: PROPERTY name:testToUShort visibility:public modality:FINAL [val] @@ -76,7 +76,7 @@ FILE fqName: fileName:/unsignedIntegerLiterals.kt PROPERTY name:testToUInt visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:testToUInt type:kotlin.UInt visibility:private [final,static] EXPRESSION_BODY - CALL 'public final fun toUInt (): kotlin.UInt [inline] declared in kotlin.UIntKt' type=kotlin.UInt origin=null + CALL 'public final fun toUInt (): kotlin.UInt [inline] declared in kotlin' type=kotlin.UInt origin=null $receiver: CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.UInt correspondingProperty: PROPERTY name:testToUInt visibility:public modality:FINAL [val] @@ -86,7 +86,7 @@ FILE fqName: fileName:/unsignedIntegerLiterals.kt PROPERTY name:testToULong visibility:public modality:FINAL [val] FIELD PROPERTY_BACKING_FIELD name:testToULong type:kotlin.ULong visibility:private [final,static] EXPRESSION_BODY - CALL 'public final fun toULong (): kotlin.ULong [inline] declared in kotlin.ULongKt' type=kotlin.ULong origin=null + CALL 'public final fun toULong (): kotlin.ULong [inline] declared in kotlin' type=kotlin.ULong origin=null $receiver: CONST Int type=kotlin.Int value=1 FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.ULong correspondingProperty: PROPERTY name:testToULong visibility:public modality:FINAL [val] diff --git a/compiler/testData/ir/irText/expressions/unsignedIntegerLiterals.kt b/compiler/testData/ir/irText/expressions/unsignedIntegerLiterals.kt index e0bb8432af2..ec536d75aa3 100644 --- a/compiler/testData/ir/irText/expressions/unsignedIntegerLiterals.kt +++ b/compiler/testData/ir/irText/expressions/unsignedIntegerLiterals.kt @@ -1,8 +1,9 @@ // FIR_IDENTICAL -// IGNORE_BACKEND: JS_IR -// IGNORE_BACKEND: JS_IR_ES6 // WITH_STDLIB +// MUTE_SIGNATURE_COMPARISON_K2: JS_IR +// ^ KT-57818 + val testSimpleUIntLiteral = 1u val testSimpleUIntLiteralWithOverflow = 0xFFFF_FFFFu diff --git a/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.ir.txt b/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.ir.txt index 0aa801514a8..4ac3632fb7c 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.TypeAliasesKt.HashMap } visibility:private [final,static] + FIELD PROPERTY_BACKING_FIELD name:registrationMap type:java.util.HashMap{ kotlin.collections.HashMap } visibility:private [final,static] EXPRESSION_BODY - CALL 'public final fun hashMapOf (): java.util.HashMap{ kotlin.collections.TypeAliasesKt.HashMap } [inline] declared in kotlin.collections.MapsKt' type=java.util.HashMap{ kotlin.collections.TypeAliasesKt.HashMap } origin=null + CALL 'public final fun hashMapOf (): java.util.HashMap{ kotlin.collections.HashMap } [inline] declared in kotlin.collections.MapsKt' type=java.util.HashMap{ kotlin.collections.HashMap } origin=null : java.lang.reflect.Type : kotlin.Any - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:private modality:FINAL <> () returnType:java.util.HashMap{ kotlin.collections.TypeAliasesKt.HashMap } + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:private modality:FINAL <> () returnType:java.util.HashMap{ kotlin.collections.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.TypeAliasesKt.HashMap } declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:registrationMap type:java.util.HashMap{ kotlin.collections.TypeAliasesKt.HashMap } visibility:private [final,static]' type=java.util.HashMap{ kotlin.collections.TypeAliasesKt.HashMap } origin=null + 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 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? [operator] declared in java.util.HashMap' type=@[EnhancedNullability] kotlin.Any? origin=GET_ARRAY_ELEMENT - $this: CALL 'private final fun (): java.util.HashMap{ kotlin.collections.TypeAliasesKt.HashMap } declared in ' type=java.util.HashMap{ kotlin.collections.TypeAliasesKt.HashMap } origin=GET_PROPERTY + $this: CALL 'private final fun (): java.util.HashMap{ kotlin.collections.HashMap } declared in ' type=java.util.HashMap{ kotlin.collections.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<*> [val] declared in .resolveClashesIfAny' type=.PlatformExtensionsClashResolver<*> origin=null WHEN type=kotlin.collections.Collection<.ComponentDescriptor> origin=null diff --git a/compiler/testData/ir/irText/firProblems/coercionToUnitForNestedWhen.ir.txt b/compiler/testData/ir/irText/firProblems/coercionToUnitForNestedWhen.ir.txt index 56cc9ca65ba..2339da71684 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? [val] 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.TypeAliasesKt.StringBuilder }, quote:kotlin.Char) returnType:kotlin.Unit + FUN name:consumeRestOfQuotedSequence visibility:public modality:FINAL <> ($receiver:java.io.Reader, sb:java.lang.StringBuilder{ kotlin.text.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.TypeAliasesKt.StringBuilder } + VALUE_PARAMETER name:sb index:0 type:java.lang.StringBuilder{ kotlin.text.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.TypeAliasesKt.StringBuilder } declared in .consumeRestOfQuotedSequence' type=java.lang.StringBuilder{ kotlin.text.TypeAliasesKt.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 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.TypeAliasesKt.StringBuilder } declared in .consumeRestOfQuotedSequence' type=java.lang.StringBuilder{ kotlin.text.TypeAliasesKt.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 p0: GET_VAR 'var ch: kotlin.Char? [var] declared in .consumeRestOfQuotedSequence' type=kotlin.Char? origin=null SET_VAR 'var ch: kotlin.Char? [var] 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/kt55458.fir.ir.txt b/compiler/testData/ir/irText/firProblems/kt55458.fir.ir.txt index 4d81a9af583..6c9bf03659f 100644 --- a/compiler/testData/ir/irText/firProblems/kt55458.fir.ir.txt +++ b/compiler/testData/ir/irText/firProblems/kt55458.fir.ir.txt @@ -2,7 +2,7 @@ FILE fqName: fileName:/kt55458.kt FUN name:main visibility:public modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:kotlin.Pair [val] - CALL 'public final fun to (that: B of kotlin.TuplesKt.to): kotlin.Pair [infix] declared in kotlin.TuplesKt' type=kotlin.Pair origin=null + CALL 'public final fun to (that: B of kotlin.to): kotlin.Pair [infix] declared in kotlin' type=kotlin.Pair origin=null : kotlin.Int : kotlin.Int $receiver: CONST Int type=kotlin.Int value=1 @@ -10,5 +10,5 @@ FILE fqName: fileName:/kt55458.kt VAR name:a type:kotlin.Int [val] CALL 'public final fun component1 (): A of kotlin.Pair [operator] declared in kotlin.Pair' type=kotlin.Int origin=COMPONENT_N(index=1) $this: GET_VAR 'val tmp_0: kotlin.Pair [val] declared in .main' type=kotlin.Pair origin=null - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: GET_VAR 'val a: kotlin.Int [val] declared in .main' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/firProblems/kt55458.ir.txt b/compiler/testData/ir/irText/firProblems/kt55458.ir.txt index b8cfe58b340..79207e9aaff 100644 --- a/compiler/testData/ir/irText/firProblems/kt55458.ir.txt +++ b/compiler/testData/ir/irText/firProblems/kt55458.ir.txt @@ -3,7 +3,7 @@ FILE fqName: fileName:/kt55458.kt BLOCK_BODY COMPOSITE type=kotlin.Unit origin=DESTRUCTURING_DECLARATION VAR IR_TEMPORARY_VARIABLE name:tmp_0 type:kotlin.Pair [val] - CALL 'public final fun to (that: B of kotlin.TuplesKt.to): kotlin.Pair [infix] declared in kotlin.TuplesKt' type=kotlin.Pair origin=null + CALL 'public final fun to (that: B of kotlin.to): kotlin.Pair [infix] declared in kotlin' type=kotlin.Pair origin=null : kotlin.Int : kotlin.Int $receiver: CONST Int type=kotlin.Int value=1 @@ -11,5 +11,5 @@ FILE fqName: fileName:/kt55458.kt VAR name:a type:kotlin.Int [val] CALL 'public final fun component1 (): A of kotlin.Pair [operator] declared in kotlin.Pair' type=kotlin.Int origin=COMPONENT_N(index=1) $this: GET_VAR 'val tmp_0: kotlin.Pair [val] declared in .main' type=kotlin.Pair origin=null - CALL 'public final fun println (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: GET_VAR 'val a: kotlin.Int [val] declared in .main' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.fir.ir.txt b/compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.fir.ir.txt index ae740d6241f..ba6a5d4675e 100644 --- a/compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.fir.ir.txt +++ b/compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.fir.ir.txt @@ -48,7 +48,7 @@ FILE fqName: fileName:/lambdaInEnumEntryConstructorCall.kt VALUE_PARAMETER name:value index:0 type:kotlin.String VALUE_PARAMETER name:nc index:1 type:.Wrapper BLOCK_BODY - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=PLUS $this: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=PLUS $this: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=PLUS diff --git a/compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.ir.txt b/compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.ir.txt index 5aafdc0382c..ae630c74675 100644 --- a/compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.ir.txt +++ b/compiler/testData/ir/irText/firProblems/lambdaInEnumEntryConstructorCall.ir.txt @@ -48,7 +48,7 @@ FILE fqName: fileName:/lambdaInEnumEntryConstructorCall.kt VALUE_PARAMETER name:value index:0 type:kotlin.String VALUE_PARAMETER name:nc index:1 type:.Wrapper BLOCK_BODY - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=PLUS $this: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=PLUS $this: CALL 'public final fun plus (other: kotlin.Any?): kotlin.String [operator] declared in kotlin.String' type=kotlin.String origin=PLUS diff --git a/compiler/testData/ir/irText/firProblems/reflectFindAnnotationOnDefaultMethodParameter.fir.ir.txt b/compiler/testData/ir/irText/firProblems/reflectFindAnnotationOnDefaultMethodParameter.fir.ir.txt index ac0afe4e13a..6c73d4e8791 100644 --- a/compiler/testData/ir/irText/firProblems/reflectFindAnnotationOnDefaultMethodParameter.fir.ir.txt +++ b/compiler/testData/ir/irText/firProblems/reflectFindAnnotationOnDefaultMethodParameter.fir.ir.txt @@ -32,12 +32,12 @@ FILE fqName: fileName:/reflectFindAnnotationOnDefaultMethodParameter.kt CONSTRUCTOR_CALL 'public constructor () [primary] declared in .box.' type=.box. origin=OBJECT_LITERAL VAR name:method type:@[FlexibleNullability] java.lang.reflect.Method? [val] CALL 'public open fun getMethod (p0: @[FlexibleNullability] kotlin.String?, vararg p1: @[FlexibleNullability] java.lang.Class<*>?): @[FlexibleNullability] java.lang.reflect.Method? declared in java.lang.Class' type=@[FlexibleNullability] java.lang.reflect.Method? origin=null - $this: CALL 'public final fun (): java.lang.Class> [inline] declared in kotlin.jvm.JvmClassMappingKt' type=java.lang.Class<.box.> origin=GET_PROPERTY + $this: CALL 'public final fun (): java.lang.Class> [inline] declared in kotlin.jvm' type=java.lang.Class<.box.> origin=GET_PROPERTY : .box. $receiver: GET_VAR 'val impl: .box. [val] declared in .box' type=.box. origin=null p0: CONST String type=kotlin.String value="m" p1: VARARG type=@[FlexibleNullability] kotlin.Array?>? varargElementType=@[FlexibleNullability] java.lang.Class<*>? - CALL 'public final fun (): java.lang.Class> declared in kotlin.jvm.JvmClassMappingKt' type=java.lang.Class origin=GET_PROPERTY + CALL 'public final fun (): java.lang.Class> declared in kotlin.jvm' type=java.lang.Class origin=GET_PROPERTY : kotlin.String $receiver: CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:String modality:FINAL visibility:public superTypes:[kotlin.Comparable; kotlin.CharSequence; java.io.Serializable]' type=kotlin.reflect.KClass VAR name:parameter type:@[FlexibleNullability] java.lang.reflect.Parameter? [val] diff --git a/compiler/testData/ir/irText/firProblems/reflectFindAnnotationOnDefaultMethodParameter.ir.txt b/compiler/testData/ir/irText/firProblems/reflectFindAnnotationOnDefaultMethodParameter.ir.txt index a28bb6aa0bc..5d3a1c6cc5c 100644 --- a/compiler/testData/ir/irText/firProblems/reflectFindAnnotationOnDefaultMethodParameter.ir.txt +++ b/compiler/testData/ir/irText/firProblems/reflectFindAnnotationOnDefaultMethodParameter.ir.txt @@ -32,12 +32,12 @@ FILE fqName: fileName:/reflectFindAnnotationOnDefaultMethodParameter.kt CONSTRUCTOR_CALL 'public constructor () [primary] declared in .box.' type=.box. origin=OBJECT_LITERAL VAR name:method type:@[FlexibleNullability] java.lang.reflect.Method? [val] CALL 'public open fun getMethod (p0: @[FlexibleNullability] kotlin.String?, vararg p1: @[FlexibleNullability] java.lang.Class<*>?): @[FlexibleNullability] java.lang.reflect.Method? declared in java.lang.Class' type=@[FlexibleNullability] java.lang.reflect.Method? origin=null - $this: CALL 'public final fun (): java.lang.Class> [inline] declared in kotlin.jvm.JvmClassMappingKt' type=java.lang.Class<.box.> origin=GET_PROPERTY + $this: CALL 'public final fun (): java.lang.Class> [inline] declared in kotlin.jvm' type=java.lang.Class<.box.> origin=GET_PROPERTY : .box. $receiver: GET_VAR 'val impl: .box. [val] declared in .box' type=.box. origin=null p0: CONST String type=kotlin.String value="m" p1: VARARG type=kotlin.Array?>? varargElementType=@[FlexibleNullability] java.lang.Class<*>? - CALL 'public final fun (): java.lang.Class> declared in kotlin.jvm.JvmClassMappingKt' type=java.lang.Class origin=GET_PROPERTY + CALL 'public final fun (): java.lang.Class> declared in kotlin.jvm' type=java.lang.Class origin=GET_PROPERTY : kotlin.String $receiver: CLASS_REFERENCE 'CLASS IR_EXTERNAL_DECLARATION_STUB CLASS name:String modality:FINAL visibility:public superTypes:[kotlin.Comparable; kotlin.CharSequence; java.io.Serializable]' type=kotlin.reflect.KClass VAR name:parameter type:@[FlexibleNullability] java.lang.reflect.Parameter? [val] diff --git a/compiler/testData/ir/irText/lambdas/anonymousFunction.ir.txt b/compiler/testData/ir/irText/lambdas/anonymousFunction.ir.txt index c0f8107aac0..1526811bb01 100644 --- a/compiler/testData/ir/irText/lambdas/anonymousFunction.ir.txt +++ b/compiler/testData/ir/irText/lambdas/anonymousFunction.ir.txt @@ -5,7 +5,7 @@ FILE fqName: fileName:/anonymousFunction.kt FUN_EXPR type=kotlin.Function0 origin=ANONYMOUS_FUNCTION FUN LOCAL_FUNCTION name: visibility:local modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY - CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:kotlin.Function0 correspondingProperty: PROPERTY name:anonymous visibility:public modality:FINAL [val] BLOCK_BODY diff --git a/compiler/testData/ir/irText/lambdas/nonLocalReturn.ir.txt b/compiler/testData/ir/irText/lambdas/nonLocalReturn.ir.txt index f138c09fb02..db16c14c9e1 100644 --- a/compiler/testData/ir/irText/lambdas/nonLocalReturn.ir.txt +++ b/compiler/testData/ir/irText/lambdas/nonLocalReturn.ir.txt @@ -57,7 +57,7 @@ FILE fqName: fileName:/nonLocalReturn.kt arg1: CONST Int type=kotlin.Int value=0 then: RETURN type=kotlin.Nothing from='local final fun (it: kotlin.Int): kotlin.Unit declared in .testLrmFoo1' GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit - CALL 'public final fun print (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun print (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: GET_VAR 'it: kotlin.Int declared in .testLrmFoo1.' type=kotlin.Int origin=null FUN name:testLrmFoo2 visibility:public modality:FINAL <> (ints:kotlin.collections.List) returnType:kotlin.Unit VALUE_PARAMETER name:ints index:0 type:kotlin.collections.List @@ -76,5 +76,5 @@ FILE fqName: fileName:/nonLocalReturn.kt arg1: CONST Int type=kotlin.Int value=0 then: RETURN type=kotlin.Nothing from='local final fun (it: kotlin.Int): kotlin.Unit declared in .testLrmFoo2' GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit - CALL 'public final fun print (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun print (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: GET_VAR 'it: kotlin.Int declared in .testLrmFoo2.' type=kotlin.Int origin=null diff --git a/compiler/testData/ir/irText/lambdas/samAdapter.ir.txt b/compiler/testData/ir/irText/lambdas/samAdapter.ir.txt index 128ec44dbcd..8e9063340a0 100644 --- a/compiler/testData/ir/irText/lambdas/samAdapter.ir.txt +++ b/compiler/testData/ir/irText/lambdas/samAdapter.ir.txt @@ -6,7 +6,7 @@ FILE fqName: fileName:/samAdapter.kt FUN_EXPR type=kotlin.Function0 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> () returnType:kotlin.Unit BLOCK_BODY - CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io.ConsoleKt' type=kotlin.Unit origin=null + CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null message: CONST String type=kotlin.String value="Hello, world!" CALL 'public abstract fun run (): kotlin.Unit declared in java.lang.Runnable' type=kotlin.Unit origin=null $this: GET_VAR 'val hello: java.lang.Runnable [val] declared in .test1' type=java.lang.Runnable origin=null diff --git a/compiler/testData/ir/irText/regressions/kt45236.ir.txt b/compiler/testData/ir/irText/regressions/kt45236.ir.txt index 44c53f14385..48e454d83cf 100644 --- a/compiler/testData/ir/irText/regressions/kt45236.ir.txt +++ b/compiler/testData/ir/irText/regressions/kt45236.ir.txt @@ -185,7 +185,7 @@ FILE fqName: fileName:/kt45236.kt TYPE_PARAMETER name:T index:0 variance: superTypes:[kotlin.Any] reified:false $receiver: VALUE_PARAMETER name: type:.NetRequestStatus.isError> BLOCK_BODY - CALL 'public final fun contract (builder: @[ExtensionFunctionType] kotlin.Function1): kotlin.Unit [inline] declared in kotlin.contracts.ContractBuilderKt' type=kotlin.Unit origin=null + CALL 'public final fun contract (builder: @[ExtensionFunctionType] kotlin.Function1): kotlin.Unit [inline] declared in kotlin.contracts' type=kotlin.Unit origin=null builder: FUN_EXPR type=@[ExtensionFunctionType] kotlin.Function1 origin=LAMBDA FUN LOCAL_FUNCTION_FOR_LAMBDA name: visibility:local modality:FINAL <> ($receiver:kotlin.contracts.ContractBuilder) returnType:kotlin.Unit $receiver: VALUE_PARAMETER name:$this$contract type:kotlin.contracts.ContractBuilder diff --git a/compiler/testData/ir/irText/stubs/builtinMap.ir.txt b/compiler/testData/ir/irText/stubs/builtinMap.ir.txt index 31ff2d509fb..6b2ec71f94a 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.StandardKt.apply [inline] declared in kotlin.StandardKt' type=java.util.LinkedHashMap<@[FlexibleNullability] K1 of .plus?, @[FlexibleNullability] V1 of .plus?>{ kotlin.collections.TypeAliasesKt.LinkedHashMap<@[FlexibleNullability] K1 of .plus?, @[FlexibleNullability] V1 of .plus?> } origin=null - : java.util.LinkedHashMap<@[FlexibleNullability] K1 of .plus?, @[FlexibleNullability] V1 of .plus?>{ kotlin.collections.TypeAliasesKt.LinkedHashMap<@[FlexibleNullability] K1 of .plus?, @[FlexibleNullability] V1 of .plus?> } + then: CALL 'public final fun apply (block: @[ExtensionFunctionType] kotlin.Function1): T of kotlin.StandardKt.apply [inline] declared in kotlin.StandardKt' 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?> } $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.TypeAliasesKt.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.TypeAliasesKt.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.TypeAliasesKt.LinkedHashMap<@[FlexibleNullability] K1 of .plus?, @[FlexibleNullability] V1 of .plus?> } + 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_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? [fake_override] 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.TypeAliasesKt.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.TypeAliasesKt.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?>{ 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 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/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 4c35d875bd7..f909c1d223a 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 @@ -62,15 +62,20 @@ class IrTextDumpHandler(testServices: TestServices) : AbstractIrHandler(testServ override fun processModule(module: TestModule, info: IrBackendInput) { if (DUMP_IR !in module.directives) return + val dumpOptions = DumpIrTreeOptions( + normalizeNames = true, + printFacadeClassInFqNames = false, + ) + info.processAllIrModuleFragments(module) { irModuleFragment, moduleName -> val builder = baseDumper.builderForModule(moduleName) val testFileToIrFile = irModuleFragment.files.groupWithTestFiles(module) for ((testFile, irFile) in testFileToIrFile) { if (testFile?.directives?.contains(EXTERNAL_FILE) == true) continue - var actualDump = irFile.dumpTreesFromLineNumber(lineNumber = 0, DumpIrTreeOptions(normalizeNames = true)) + var actualDump = irFile.dumpTreesFromLineNumber(lineNumber = 0, dumpOptions) if (actualDump.isEmpty()) { - actualDump = irFile.dumpTreesFromLineNumber(lineNumber = UNDEFINED_OFFSET, DumpIrTreeOptions(normalizeNames = true)) + actualDump = irFile.dumpTreesFromLineNumber(lineNumber = UNDEFINED_OFFSET, dumpOptions) } builder.append(actualDump) } diff --git a/plugins/fir-plugin-prototype/testData/box/classWithAllPropertiesConstructor.fir.ir.txt b/plugins/fir-plugin-prototype/testData/box/classWithAllPropertiesConstructor.fir.ir.txt index 693fe7e4288..b3fe0a97491 100644 --- a/plugins/fir-plugin-prototype/testData/box/classWithAllPropertiesConstructor.fir.ir.txt +++ b/plugins/fir-plugin-prototype/testData/box/classWithAllPropertiesConstructor.fir.ir.txt @@ -208,7 +208,7 @@ FILE fqName: fileName:/main.kt VAR name:constructor type:java.lang.reflect.Constructor<.Derived> [val] CALL 'public final fun CHECK_NOT_NULL (arg0: T0 of kotlin.internal.ir.CHECK_NOT_NULL?): {T0 of kotlin.internal.ir.CHECK_NOT_NULL & Any} declared in kotlin.internal.ir' type=java.lang.reflect.Constructor<.Derived> origin=EXCLEXCL : java.lang.reflect.Constructor<.Derived> - arg0: CALL 'public final fun (): java.lang.reflect.Constructor>? declared in kotlin.reflect.jvm.ReflectJvmMapping' type=java.lang.reflect.Constructor<.Derived>? origin=GET_PROPERTY + arg0: CALL 'public final fun (): java.lang.reflect.Constructor>? declared in kotlin.reflect.jvm' type=java.lang.reflect.Constructor<.Derived>? origin=GET_PROPERTY : .Derived $receiver: CALL 'public final fun first (predicate: kotlin.Function1): T of kotlin.collections.CollectionsKt.first [inline] declared in kotlin.collections.CollectionsKt' type=kotlin.reflect.KFunction<.Derived> origin=null : kotlin.reflect.KFunction<.Derived> @@ -221,7 +221,7 @@ FILE fqName: fileName:/main.kt RETURN type=kotlin.Nothing from='local final fun (it: kotlin.reflect.KFunction<.Derived>): kotlin.Boolean declared in .box' CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ arg0: CALL 'public abstract fun (): kotlin.Int declared in kotlin.collections.List' type=kotlin.Int origin=GET_PROPERTY - $this: CALL 'public final fun (): kotlin.collections.List declared in kotlin.reflect.full.KCallables' type=kotlin.collections.List origin=GET_PROPERTY + $this: CALL 'public final fun (): kotlin.collections.List declared in kotlin.reflect.full' type=kotlin.collections.List origin=GET_PROPERTY $receiver: GET_VAR 'it: kotlin.reflect.KFunction<.Derived> declared in .box.' type=kotlin.reflect.KFunction<.Derived> origin=null arg1: CONST Int type=kotlin.Int value=3 VAR name:derived type:@[FlexibleNullability] .Derived? [val]