[IR] Replace indexes with names for mfvc methods and fields

Signed-off-by: Evgeniy.Zhelenskiy <Evgeniy.Zhelenskiy@jetbrains.com>

#KT-1179

compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/MfvcNode.kt

@@ -5,6 +5,8 @@
 
 package org.jetbrains.kotlin.backend.jvm
 
+import org.jetbrains.kotlin.backend.jvm.NameableMfvcNodeImpl.Companion.MethodFullNameMode
+import org.jetbrains.kotlin.backend.jvm.NameableMfvcNodeImpl.Companion.MethodFullNameMode.*
 import org.jetbrains.kotlin.backend.jvm.ir.erasedUpperBound
 import org.jetbrains.kotlin.backend.jvm.ir.isMultiFieldValueClassType
 import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper
@@ -83,12 +85,10 @@ sealed interface NameableMfvcNode : MfvcNode {
     val namedNodeImpl: NameableMfvcNodeImpl
 }
 
-val NameableMfvcNode.nameParts: List<IndexedNamePart>
+val NameableMfvcNode.nameParts: List<Name>
     get() = namedNodeImpl.nameParts
 val NameableMfvcNode.name: Name
-    get() = nameParts.last().name
-val NameableMfvcNode.index: Int
-    get() = nameParts.last().index
+    get() = nameParts.last()
 val NameableMfvcNode.unboxMethod: IrSimpleFunction
     get() = namedNodeImpl.unboxMethod
 val NameableMfvcNode.fullMethodName: Name
@@ -99,32 +99,36 @@ val NameableMfvcNode.hasPureUnboxMethod: Boolean
     get() = namedNodeImpl.hasPureUnboxMethod
 
 
-data class IndexedNamePart(val index: Int, val name: Name)
-
 class NameableMfvcNodeImpl(
-    rootPropertyName: String?,
-    val nameParts: List<IndexedNamePart>,
+    methodFullNameMode: MethodFullNameMode,
+    val nameParts: List<Name>,
     val unboxMethod: IrSimpleFunction,
     val hasPureUnboxMethod: Boolean,
 ) {
-    val fullMethodName = makeFullMethodName(rootPropertyName, nameParts)
-    val fullFieldName = makeFullFieldName(rootPropertyName, nameParts)
+    val fullMethodName = makeFullMethodName(methodFullNameMode, nameParts)
+    val fullFieldName = makeFullFieldName(nameParts)
 
     companion object {
-        @JvmStatic
-        fun makeFullMethodName(rootPropertyName: String?, nameParts: List<IndexedNamePart>): Name = if (rootPropertyName == null) {
-            val restJoined = nameParts.joinToString("-") { it.index.toString() }
-            Name.identifier("${KotlinTypeMapper.UNBOX_JVM_METHOD_NAME}-$restJoined")
-        } else {
-            val wholeName = (listOf(JvmAbi.getterName(rootPropertyName)) + nameParts.map { it.index.toString() }).joinToString("-")
-            Name.identifier(wholeName)
-        }
+        enum class MethodFullNameMode { UnboxFunction, Getter }
 
         @JvmStatic
-        fun makeFullFieldName(rootPropertyName: String?, nameParts: List<IndexedNamePart>): Name {
-            val name = Name.guessByFirstCharacter(rootPropertyName ?: "field")
-            val joined = (listOf(name.asStringStripSpecialMarkers()) + nameParts.map { it.index.toString() }).joinToString("-")
-            return if (name.isSpecial) Name.special("<$joined>") else Name.identifier(joined)
+        fun makeFullMethodName(methodFullNameMode: MethodFullNameMode, nameParts: List<Name>): Name = nameParts
+            .map { it.asStringStripSpecialMarkers() }
+            .let {
+                when (methodFullNameMode) {
+                    UnboxFunction -> listOf(KotlinTypeMapper.UNBOX_JVM_METHOD_NAME) + it
+                    Getter -> listOf(JvmAbi.getterName(it.first())) + it.subList(1, nameParts.size)
+                }
+            }
+            .joinToString("-")
+            .let(Name::identifier)
+
+        @JvmStatic
+        fun makeFullFieldName(nameParts: List<Name>): Name {
+            require(nameParts.isNotEmpty()) { "Name must contain at least one part" }
+            val isSpecial = nameParts.any { it.isSpecial }
+            val joined = nameParts.joinToString("-") { it.asStringStripSpecialMarkers() }
+            return if (isSpecial) Name.special("<$joined>") else Name.identifier(joined)
         }
     }
 }
@@ -173,7 +177,6 @@ class MfvcNodeWithSubnodesImpl(val subnodes: List<NameableMfvcNode>, unboxMethod
     init {
         require(subnodes.isNotEmpty())
         require(subnodes.map { it.nameParts.dropLast(1) }.allEqual())
-        require(subnodes.map { it.index } == subnodes.indices.toList())
     }
 
     private val mapping = subnodes.associateBy { it.name }.also { mapping ->
@@ -278,13 +281,13 @@ private fun validateGettingAccessorParameters(function: IrSimpleFunction) {
 
 class LeafMfvcNode(
     override val type: IrType,
-    rootPropertyName: String?,
-    nameParts: List<IndexedNamePart>,
+    methodFullNameMode: MethodFullNameMode,
+    nameParts: List<Name>,
     val field: IrField?,
     unboxMethod: IrSimpleFunction,
     hasPureUnboxMethod: Boolean,
 ) : NameableMfvcNode {
-    override val namedNodeImpl: NameableMfvcNodeImpl = NameableMfvcNodeImpl(rootPropertyName, nameParts, unboxMethod, hasPureUnboxMethod)
+    override val namedNodeImpl: NameableMfvcNodeImpl = NameableMfvcNodeImpl(methodFullNameMode, nameParts, unboxMethod, hasPureUnboxMethod)
 
     override val leavesCount: Int
         get() = 1
@@ -319,14 +322,14 @@ val MfvcNode.fields
 
 class IntermediateMfvcNode(
     override val type: IrSimpleType,
-    rootPropertyName: String?,
-    nameParts: List<IndexedNamePart>,
+    methodFullNameMode: MethodFullNameMode,
+    nameParts: List<Name>,
     subnodes: List<NameableMfvcNode>,
     unboxMethod: IrSimpleFunction,
     hasPureUnboxMethod: Boolean,
     val rootNode: RootMfvcNode, // root node corresponding type of the node
 ) : NameableMfvcNode, MfvcNodeWithSubnodes {
-    override val namedNodeImpl: NameableMfvcNodeImpl = NameableMfvcNodeImpl(rootPropertyName, nameParts, unboxMethod, hasPureUnboxMethod)
+    override val namedNodeImpl: NameableMfvcNodeImpl = NameableMfvcNodeImpl(methodFullNameMode, nameParts, unboxMethod, hasPureUnboxMethod)
     override val subnodesImpl: MfvcNodeWithSubnodesImpl = MfvcNodeWithSubnodesImpl(subnodes, unboxMethod)
     override val leavesCount
         get() = leaves.size

compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/MfvcNodeFactory.kt

@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.backend.common.lower.irBlockBody
 import org.jetbrains.kotlin.backend.common.lower.parents
 import org.jetbrains.kotlin.backend.jvm.IrPropertyOrIrField.Field
 import org.jetbrains.kotlin.backend.jvm.IrPropertyOrIrField.Property
+import org.jetbrains.kotlin.backend.jvm.NameableMfvcNodeImpl.Companion.MethodFullNameMode
 import org.jetbrains.kotlin.backend.jvm.ir.createJvmIrBuilder
 import org.jetbrains.kotlin.backend.jvm.ir.erasedUpperBound
 import org.jetbrains.kotlin.backend.jvm.ir.upperBound
@@ -39,8 +40,8 @@ fun createLeafMfvcNode(
     parent: IrDeclarationContainer,
     context: JvmBackendContext,
     type: IrType,
-    rootPropertyName: String?,
-    nameParts: List<IndexedNamePart>,
+    methodFullNameMode: MethodFullNameMode,
+    nameParts: List<Name>,
     fieldAnnotations: List<IrConstructorCall>,
     static: Boolean,
     overriddenNode: LeafMfvcNode?,
@@ -51,8 +52,8 @@ fun createLeafMfvcNode(
 ): LeafMfvcNode {
     require(!type.needsMfvcFlattening()) { "${type.render()} requires flattening" }
 
-    val fullMethodName = NameableMfvcNodeImpl.makeFullMethodName(rootPropertyName, nameParts)
-    val fullFieldName = NameableMfvcNodeImpl.makeFullFieldName(rootPropertyName, nameParts)
+    val fullMethodName = NameableMfvcNodeImpl.makeFullMethodName(methodFullNameMode, nameParts)
+    val fullFieldName = NameableMfvcNodeImpl.makeFullFieldName(nameParts)
 
     val field = oldPropertyBackingField?.let { oldBackingField ->
         context.irFactory.buildField {
@@ -79,7 +80,7 @@ fun createLeafMfvcNode(
         modality,
     ) { receiver -> irGetField(if (field!!.isStatic) null else irGet(receiver!!), field) }
 
-    return LeafMfvcNode(type, rootPropertyName, nameParts, field, unboxMethod, defaultMethodsImplementationSourceNode.isPure())
+    return LeafMfvcNode(type, methodFullNameMode, nameParts, field, unboxMethod, defaultMethodsImplementationSourceNode.isPure())
 }
 
 private fun Pair<IrSimpleFunction?, NameableMfvcNode>?.isPure(): Boolean {
@@ -133,8 +134,8 @@ fun createNameableMfvcNodes(
     context: JvmBackendContext,
     type: IrSimpleType,
     typeArguments: TypeArguments,
-    rootPropertyName: String?,
-    nameParts: List<IndexedNamePart>,
+    methodFullNameMode: MethodFullNameMode,
+    nameParts: List<Name>,
     fieldAnnotations: List<IrConstructorCall>,
     static: Boolean,
     overriddenNode: NameableMfvcNode?,
@@ -147,7 +148,7 @@ fun createNameableMfvcNodes(
     context,
     type,
     typeArguments,
-    rootPropertyName,
+    methodFullNameMode,
     nameParts,
     fieldAnnotations,
     static,
@@ -160,7 +161,7 @@ fun createNameableMfvcNodes(
     parent,
     context,
     type,
-    rootPropertyName,
+    methodFullNameMode,
     nameParts,
     fieldAnnotations,
     static,
@@ -176,8 +177,8 @@ fun createIntermediateMfvcNode(
     context: JvmBackendContext,
     type: IrSimpleType,
     typeArguments: TypeArguments,
-    rootPropertyName: String?,
-    nameParts: List<IndexedNamePart>,
+    methodFullNameMode: MethodFullNameMode,
+    nameParts: List<Name>,
     fieldAnnotations: List<IrConstructorCall>,
     static: Boolean,
     overriddenNode: IntermediateMfvcNode?,
@@ -198,7 +199,7 @@ fun createIntermediateMfvcNode(
     val shadowBackingFieldProperty = if (oldField == null) oldGetter?.getGetterField()?.correspondingPropertySymbol?.owner else null
     val useOldGetter = oldGetter != null && (oldField == null || !oldGetter.isDefaultGetter(oldField))
 
-    val subnodes = representation.underlyingPropertyNamesToTypes.mapIndexed { index, (name, type) ->
+    val subnodes = representation.underlyingPropertyNamesToTypes.map { (name, type) ->
         val newType = type.substitute(typeArguments) as IrSimpleType
         val newTypeArguments = typeArguments.toMutableMap().apply { putAll(makeTypeArgumentsFromType(newType)) }
         val newDefaultMethodsImplementationSourceNode = when {
@@ -217,8 +218,8 @@ fun createIntermediateMfvcNode(
             context,
             newType,
             newTypeArguments,
-            rootPropertyName,
-            nameParts + IndexedNamePart(index, name),
+            methodFullNameMode,
+            nameParts + name,
             fieldAnnotations,
             static,
             overriddenNode?.let { it[name]!! },
@@ -229,7 +230,7 @@ fun createIntermediateMfvcNode(
         )
     }
 
-    val fullMethodName = NameableMfvcNodeImpl.makeFullMethodName(rootPropertyName, nameParts)
+    val fullMethodName = NameableMfvcNodeImpl.makeFullMethodName(methodFullNameMode, nameParts)
 
     val unboxMethod = if (useOldGetter) oldGetter!! else makeUnboxMethod(
         context, fullMethodName, type, parent, overriddenNode, static, defaultMethodsImplementationSourceNode, oldGetter, modality
@@ -241,7 +242,7 @@ fun createIntermediateMfvcNode(
 
     val hasPureUnboxMethod = defaultMethodsImplementationSourceNode.isPure() && subnodes.all { it.hasPureUnboxMethod }
     return IntermediateMfvcNode(
-        type, rootPropertyName, nameParts, subnodes, unboxMethod, hasPureUnboxMethod, rootNode
+        type, methodFullNameMode, nameParts, subnodes, unboxMethod, hasPureUnboxMethod, rootNode
     )
 }
 
@@ -425,7 +426,7 @@ private fun makeRootMfvcNodeSubnodes(
     properties: Map<Pair<Boolean, Name>, IrProperty>,
     context: JvmBackendContext,
     mfvc: IrClass
-) = representation.underlyingPropertyNamesToTypes.mapIndexed { index, (name, type) ->
+) = representation.underlyingPropertyNamesToTypes.map { (name, type) ->
     val typeArguments = makeTypeArgumentsFromType(type)
     val oldProperty = properties[false to name]!!
     val oldBackingField = oldProperty.backingFieldIfNotDelegate
@@ -437,8 +438,8 @@ private fun makeRootMfvcNodeSubnodes(
         context,
         type,
         typeArguments,
-        null,
-        listOf(IndexedNamePart(index, name)),
+        MethodFullNameMode.UnboxFunction,
+        listOf(name),
         oldBackingField?.annotations ?: listOf(),
         static,
         overriddenNode,
@@ -478,7 +479,7 @@ fun createIntermediateNodeForMfvcPropertyOfRegularClass(
     val overriddenNode = oldGetter?.let { getOverriddenNode(context.multiFieldValueClassReplacements, it) as IntermediateMfvcNode? }
     val modality = if (oldGetter == null || oldGetter.modality == Modality.FINAL) Modality.FINAL else oldGetter.modality
     return createIntermediateMfvcNode(
-        parent, context, type, makeTypeArgumentsFromType(type), oldProperty.name.asString(), listOf(),
+        parent, context, type, makeTypeArgumentsFromType(type), MethodFullNameMode.Getter, listOf(oldProperty.name),
         fieldAnnotations, static, overriddenNode, null, oldGetter, modality, oldField
     ).also {
         updateAnnotationsAndPropertyFromOldProperty(oldProperty)
@@ -493,7 +494,7 @@ fun createIntermediateNodeForStandaloneMfvcField(
     val type = oldField.type
     require(type is IrSimpleType && type.needsMfvcFlattening()) { "Expected MFVC but got ${type.render()}" }
     return createIntermediateMfvcNode(
-        parent, context, type, makeTypeArgumentsFromType(type), oldField.name.asString(), listOf(),
+        parent, context, type, makeTypeArgumentsFromType(type), MethodFullNameMode.Getter, listOf(oldField.name),
         oldField.annotations, oldField.isStatic, null, null, null, Modality.FINAL, oldField
     )
 }

compiler/testData/codegen/box/valueClasses/classFlattening.txt

@@ -72,13 +72,13 @@ public final class Extensions {
 @kotlin.Metadata
 public final class GreaterMfvc {
     // source: 'classFlattening.kt'
-    private final field field-0-0: int
-    private final field field-0-1: int
-    private final @org.jetbrains.annotations.NotNull field field-0-2: java.lang.String
-    private final field field-1: int
-    private final field field-2-0: int
-    private final field field-2-1: int
-    private final @org.jetbrains.annotations.NotNull field field-2-2: java.lang.String
+    private final field x-x: int
+    private final field x-y: int
+    private final @org.jetbrains.annotations.NotNull field x-z: java.lang.String
+    private final field y: int
+    private final field z-x: int
+    private final field z-y: int
+    private final @org.jetbrains.annotations.NotNull field z-z: java.lang.String
     private synthetic method <init>(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: int, p6: java.lang.String): void
     public synthetic final static method box-impl(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: int, p6: java.lang.String): GreaterMfvc
     public final static method constructor-impl(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String, p3: int, p4: int, p5: int, @org.jetbrains.annotations.NotNull p6: java.lang.String): void
@@ -92,15 +92,15 @@ public final class GreaterMfvc {
     public static method hashCode-impl(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: int, p6: java.lang.String): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: int, p6: java.lang.String): java.lang.String
-    public synthetic final method unbox-impl-0(): SimpleMfvc
-    public synthetic final method unbox-impl-0-0(): int
-    public synthetic final method unbox-impl-0-1(): int
-    public synthetic final method unbox-impl-0-2(): java.lang.String
-    public synthetic final method unbox-impl-1(): int
-    public synthetic final method unbox-impl-2(): SimpleMfvc
-    public synthetic final method unbox-impl-2-0(): int
-    public synthetic final method unbox-impl-2-1(): int
-    public synthetic final method unbox-impl-2-2(): java.lang.String
+    public synthetic final method unbox-impl-x(): SimpleMfvc
+    public synthetic final method unbox-impl-x-x(): int
+    public synthetic final method unbox-impl-x-y(): int
+    public synthetic final method unbox-impl-x-z(): java.lang.String
+    public synthetic final method unbox-impl-y(): int
+    public synthetic final method unbox-impl-z(): SimpleMfvc
+    public synthetic final method unbox-impl-z-x(): int
+    public synthetic final method unbox-impl-z-y(): int
+    public synthetic final method unbox-impl-z-z(): java.lang.String
 }
 
 @kotlin.jvm.JvmInline
@@ -149,9 +149,9 @@ public final class SimpleMfvc$Companion {
 public final class SimpleMfvc {
     // source: 'classFlattening.kt'
     public final static @org.jetbrains.annotations.NotNull field Companion: SimpleMfvc$Companion
-    private final field field-0: int
-    private final field field-1: int
-    private final @org.jetbrains.annotations.NotNull field field-2: java.lang.String
+    private final field x: int
+    private final field y: int
+    private final @org.jetbrains.annotations.NotNull field z: java.lang.String
     static method <clinit>(): void
     private synthetic method <init>(p0: int, p1: int, p2: java.lang.String): void
     public synthetic final static method box-impl(p0: int, p1: int, p2: java.lang.String): SimpleMfvc
@@ -174,8 +174,8 @@ public final class SimpleMfvc {
     public static method hashCode-impl(p0: int, p1: int, p2: java.lang.String): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int, p2: java.lang.String): java.lang.String
-    public synthetic final method unbox-impl-0(): int
-    public synthetic final method unbox-impl-1(): int
-    public synthetic final method unbox-impl-2(): java.lang.String
+    public synthetic final method unbox-impl-x(): int
+    public synthetic final method unbox-impl-y(): int
+    public synthetic final method unbox-impl-z(): java.lang.String
     public final inner class SimpleMfvc$Companion
 }

compiler/testData/codegen/box/valueClasses/complex.fir.txt

@@ -41,15 +41,15 @@ public final class B {
 public final class Base1$DefaultImpls {
     // source: 'complex.kt'
     public static @org.jetbrains.annotations.NotNull method getFakeOverrideMFVC(@org.jetbrains.annotations.NotNull p0: Base1): R
-    public synthetic static method getFakeOverrideMFVC-0(p0: Base1): int
-    public synthetic static method getFakeOverrideMFVC-1(p0: Base1): int
-    public synthetic static method getFakeOverrideMFVC-2(p0: Base1): E
-    public synthetic static method getFakeOverrideMFVC-2-0(p0: Base1): D
-    public synthetic static method getFakeOverrideMFVC-2-0-0(p0: Base1): C
-    public synthetic static method getFakeOverrideMFVC-2-0-0-0(p0: Base1): int
-    public synthetic static method getFakeOverrideMFVC-2-0-0-1(p0: Base1): int
-    public synthetic static method getFakeOverrideMFVC-2-0-0-2(p0: Base1): java.lang.String
-    public synthetic static method getFakeOverrideMFVC-3(p0: Base1): java.util.List
+    public synthetic static method getFakeOverrideMFVC-t(p0: Base1): java.util.List
+    public synthetic static method getFakeOverrideMFVC-x(p0: Base1): int
+    public synthetic static method getFakeOverrideMFVC-y(p0: Base1): int
+    public synthetic static method getFakeOverrideMFVC-z(p0: Base1): E
+    public synthetic static method getFakeOverrideMFVC-z-x(p0: Base1): D
+    public synthetic static method getFakeOverrideMFVC-z-x-x(p0: Base1): C
+    public synthetic static method getFakeOverrideMFVC-z-x-x-x(p0: Base1): int
+    public synthetic static method getFakeOverrideMFVC-z-x-x-y(p0: Base1): int
+    public synthetic static method getFakeOverrideMFVC-z-x-x-z(p0: Base1): java.lang.String
     public static method getFakeOverrideRegular(@org.jetbrains.annotations.NotNull p0: Base1): int
     public final inner class Base1$DefaultImpls
 }
@@ -58,15 +58,15 @@ public final class Base1$DefaultImpls {
 public interface Base1 {
     // source: 'complex.kt'
     public abstract @org.jetbrains.annotations.NotNull method getFakeOverrideMFVC(): R
-    public synthetic abstract method getFakeOverrideMFVC-0(): int
-    public synthetic abstract method getFakeOverrideMFVC-1(): int
-    public synthetic abstract method getFakeOverrideMFVC-2(): E
-    public synthetic abstract method getFakeOverrideMFVC-2-0(): D
-    public synthetic abstract method getFakeOverrideMFVC-2-0-0(): C
-    public synthetic abstract method getFakeOverrideMFVC-2-0-0-0(): int
-    public synthetic abstract method getFakeOverrideMFVC-2-0-0-1(): int
-    public synthetic abstract method getFakeOverrideMFVC-2-0-0-2(): java.lang.String
-    public synthetic abstract method getFakeOverrideMFVC-3(): java.util.List
+    public synthetic abstract method getFakeOverrideMFVC-t(): java.util.List
+    public synthetic abstract method getFakeOverrideMFVC-x(): int
+    public synthetic abstract method getFakeOverrideMFVC-y(): int
+    public synthetic abstract method getFakeOverrideMFVC-z(): E
+    public synthetic abstract method getFakeOverrideMFVC-z-x(): D
+    public synthetic abstract method getFakeOverrideMFVC-z-x-x(): C
+    public synthetic abstract method getFakeOverrideMFVC-z-x-x-x(): int
+    public synthetic abstract method getFakeOverrideMFVC-z-x-x-y(): int
+    public synthetic abstract method getFakeOverrideMFVC-z-x-x-z(): java.lang.String
     public abstract method getFakeOverrideRegular(): int
     public final inner class Base1$DefaultImpls
 }
@@ -75,15 +75,15 @@ public interface Base1 {
 public interface Base2 {
     // source: 'complex.kt'
     public abstract @org.jetbrains.annotations.NotNull method getL(): R
-    public synthetic abstract method getL-0(): int
-    public synthetic abstract method getL-1(): int
-    public synthetic abstract method getL-2(): E
-    public synthetic abstract method getL-2-0(): D
-    public synthetic abstract method getL-2-0-0(): C
-    public synthetic abstract method getL-2-0-0-0(): int
-    public synthetic abstract method getL-2-0-0-1(): int
-    public synthetic abstract method getL-2-0-0-2(): java.lang.String
-    public synthetic abstract method getL-3(): java.util.List
+    public synthetic abstract method getL-t(): java.util.List
+    public synthetic abstract method getL-x(): int
+    public synthetic abstract method getL-y(): int
+    public synthetic abstract method getL-z(): E
+    public synthetic abstract method getL-z-x(): D
+    public synthetic abstract method getL-z-x-x(): C
+    public synthetic abstract method getL-z-x-x-x(): int
+    public synthetic abstract method getL-z-x-x-y(): int
+    public synthetic abstract method getL-z-x-x-z(): java.lang.String
     public abstract method setL-sUp7gFk(p0: int, p1: int, p2: int, p3: int, @org.jetbrains.annotations.NotNull p4: java.lang.String, @org.jetbrains.annotations.NotNull p5: java.util.List): void
 }
 
@@ -91,11 +91,11 @@ public interface Base2 {
 public interface Base3 {
     // source: 'complex.kt'
     public abstract @org.jetbrains.annotations.NotNull method getZ(): E
-    public synthetic abstract method getZ-0(): D
-    public synthetic abstract method getZ-0-0(): C
-    public synthetic abstract method getZ-0-0-0(): int
-    public synthetic abstract method getZ-0-0-1(): int
-    public synthetic abstract method getZ-0-0-2(): java.lang.String
+    public synthetic abstract method getZ-x(): D
+    public synthetic abstract method getZ-x-x(): C
+    public synthetic abstract method getZ-x-x-x(): int
+    public synthetic abstract method getZ-x-x-y(): int
+    public synthetic abstract method getZ-x-x-z(): java.lang.String
 }
 
 @kotlin.Metadata
@@ -109,9 +109,9 @@ public interface Base4 {
 @kotlin.Metadata
 public final class C {
     // source: 'complex.kt'
-    private final field field-0: int
-    private final field field-1: int
-    private final @org.jetbrains.annotations.NotNull field field-2: java.lang.String
+    private final field x: int
+    private final field y: int
+    private final @org.jetbrains.annotations.NotNull field z: java.lang.String
     private synthetic method <init>(p0: int, p1: int, p2: java.lang.String): void
     public synthetic final static method box-impl(p0: int, p1: int, p2: java.lang.String): C
     public final static method constructor-impl(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): void
@@ -125,9 +125,9 @@ public final class C {
     public static method hashCode-impl(p0: int, p1: int, p2: java.lang.String): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int, p2: java.lang.String): java.lang.String
-    public synthetic final method unbox-impl-0(): int
-    public synthetic final method unbox-impl-1(): int
-    public synthetic final method unbox-impl-2(): java.lang.String
+    public synthetic final method unbox-impl-x(): int
+    public synthetic final method unbox-impl-y(): int
+    public synthetic final method unbox-impl-z(): java.lang.String
 }
 
 @kotlin.Metadata
@@ -154,9 +154,9 @@ public final class ComplexKt {
 @kotlin.Metadata
 public final class D {
     // source: 'complex.kt'
-    private final field field-0-0: int
-    private final field field-0-1: int
-    private final @org.jetbrains.annotations.NotNull field field-0-2: java.lang.String
+    private final field x-x: int
+    private final field x-y: int
+    private final @org.jetbrains.annotations.NotNull field x-z: java.lang.String
     private synthetic method <init>(p0: int, p1: int, p2: java.lang.String): void
     public synthetic final static method box-impl(p0: int, p1: int, p2: java.lang.String): D
     public final static method constructor-impl(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): void
@@ -169,19 +169,19 @@ public final class D {
     public static method hashCode-impl(p0: int, p1: int, p2: java.lang.String): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int, p2: java.lang.String): java.lang.String
-    public synthetic final method unbox-impl-0(): C
-    public synthetic final method unbox-impl-0-0(): int
-    public synthetic final method unbox-impl-0-1(): int
-    public synthetic final method unbox-impl-0-2(): java.lang.String
+    public synthetic final method unbox-impl-x(): C
+    public synthetic final method unbox-impl-x-x(): int
+    public synthetic final method unbox-impl-x-y(): int
+    public synthetic final method unbox-impl-x-z(): java.lang.String
 }
 
 @kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class E {
     // source: 'complex.kt'
-    private final field field-0-0-0: int
-    private final field field-0-0-1: int
-    private final @org.jetbrains.annotations.NotNull field field-0-0-2: java.lang.String
+    private final field x-x-x: int
+    private final field x-x-y: int
+    private final @org.jetbrains.annotations.NotNull field x-x-z: java.lang.String
     private synthetic method <init>(p0: int, p1: int, p2: java.lang.String): void
     public synthetic final static method box-impl(p0: int, p1: int, p2: java.lang.String): E
     public final static method constructor-impl(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): void
@@ -195,34 +195,34 @@ public final class E {
     public final static method setWithNonTrivialSetters-sUp7gFk(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String, p3: int, p4: int, @org.jetbrains.annotations.NotNull p5: java.lang.String): void
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int, p2: java.lang.String): java.lang.String
-    public synthetic final method unbox-impl-0(): D
-    public synthetic final method unbox-impl-0-0(): C
-    public synthetic final method unbox-impl-0-0-0(): int
-    public synthetic final method unbox-impl-0-0-1(): int
-    public synthetic final method unbox-impl-0-0-2(): java.lang.String
+    public synthetic final method unbox-impl-x(): D
+    public synthetic final method unbox-impl-x-x(): C
+    public synthetic final method unbox-impl-x-x-x(): int
+    public synthetic final method unbox-impl-x-x-y(): int
+    public synthetic final method unbox-impl-x-x-z(): java.lang.String
 }
 
 @kotlin.Metadata
 public final class NotInlined {
     // source: 'complex.kt'
-    private field l-0: int
-    private field l-1: int
-    private field l-2-0-0-0: int
-    private field l-2-0-0-1: int
-    private @org.jetbrains.annotations.NotNull field l-2-0-0-2: java.lang.String
-    private @org.jetbrains.annotations.NotNull field l-3: java.util.List
-    private final field withNonTrivialGettersWithBF-0: int
-    private final field withNonTrivialGettersWithBF-1: int
-    private final field withNonTrivialGettersWithBF-2-0-0-0: int
-    private final field withNonTrivialGettersWithBF-2-0-0-1: int
-    private final @org.jetbrains.annotations.NotNull field withNonTrivialGettersWithBF-2-0-0-2: java.lang.String
-    private final @org.jetbrains.annotations.NotNull field withNonTrivialGettersWithBF-3: java.util.List
-    private field withNonTrivialSettersWithBF-0: int
-    private field withNonTrivialSettersWithBF-1: int
-    private field withNonTrivialSettersWithBF-2-0-0-0: int
-    private field withNonTrivialSettersWithBF-2-0-0-1: int
-    private @org.jetbrains.annotations.NotNull field withNonTrivialSettersWithBF-2-0-0-2: java.lang.String
-    private @org.jetbrains.annotations.NotNull field withNonTrivialSettersWithBF-3: java.util.List
+    private @org.jetbrains.annotations.NotNull field l-t: java.util.List
+    private field l-x: int
+    private field l-y: int
+    private field l-z-x-x-x: int
+    private field l-z-x-x-y: int
+    private @org.jetbrains.annotations.NotNull field l-z-x-x-z: java.lang.String
+    private final @org.jetbrains.annotations.NotNull field withNonTrivialGettersWithBF-t: java.util.List
+    private final field withNonTrivialGettersWithBF-x: int
+    private final field withNonTrivialGettersWithBF-y: int
+    private final field withNonTrivialGettersWithBF-z-x-x-x: int
+    private final field withNonTrivialGettersWithBF-z-x-x-y: int
+    private final @org.jetbrains.annotations.NotNull field withNonTrivialGettersWithBF-z-x-x-z: java.lang.String
+    private @org.jetbrains.annotations.NotNull field withNonTrivialSettersWithBF-t: java.util.List
+    private field withNonTrivialSettersWithBF-x: int
+    private field withNonTrivialSettersWithBF-y: int
+    private field withNonTrivialSettersWithBF-z-x-x-x: int
+    private field withNonTrivialSettersWithBF-z-x-x-y: int
+    private @org.jetbrains.annotations.NotNull field withNonTrivialSettersWithBF-z-x-x-z: java.lang.String
     private field y: int
     private method <init>(p0: int, p1: int, p2: int, p3: int, p4: java.lang.String, p5: java.util.List, p6: int): void
     public synthetic method <init>(p0: int, p1: int, p2: int, p3: int, p4: java.lang.String, p5: java.util.List, p6: int, p7: kotlin.jvm.internal.DefaultConstructorMarker): void
@@ -230,45 +230,45 @@ public final class NotInlined {
     public method getFakeOverrideRegular(): int
     public final @org.jetbrains.annotations.NotNull method getL(): R
     public synthetic bridge method getL(): java.lang.Object
-    public synthetic final method getL-0(): int
-    public synthetic final method getL-1(): int
-    public synthetic final method getL-2(): E
-    public synthetic final method getL-2-0(): D
-    public synthetic final method getL-2-0-0(): C
-    public synthetic final method getL-2-0-0-0(): int
-    public synthetic final method getL-2-0-0-1(): int
-    public synthetic final method getL-2-0-0-2(): java.lang.String
-    public synthetic final method getL-3(): java.util.List
+    public synthetic final method getL-t(): java.util.List
+    public synthetic final method getL-x(): int
+    public synthetic final method getL-y(): int
+    public synthetic final method getL-z(): E
+    public synthetic final method getL-z-x(): D
+    public synthetic final method getL-z-x-x(): C
+    public synthetic final method getL-z-x-x-x(): int
+    public synthetic final method getL-z-x-x-y(): int
+    public synthetic final method getL-z-x-x-z(): java.lang.String
     public final @org.jetbrains.annotations.NotNull method getWithNonTrivialGettersWithBF(): R
-    public synthetic final method getWithNonTrivialGettersWithBF-0(): int
-    public synthetic final method getWithNonTrivialGettersWithBF-1(): int
-    public synthetic final method getWithNonTrivialGettersWithBF-2(): E
-    public synthetic final method getWithNonTrivialGettersWithBF-2-0(): D
-    public synthetic final method getWithNonTrivialGettersWithBF-2-0-0(): C
-    public synthetic final method getWithNonTrivialGettersWithBF-2-0-0-0(): int
-    public synthetic final method getWithNonTrivialGettersWithBF-2-0-0-1(): int
-    public synthetic final method getWithNonTrivialGettersWithBF-2-0-0-2(): java.lang.String
-    public synthetic final method getWithNonTrivialGettersWithBF-3(): java.util.List
+    public synthetic final method getWithNonTrivialGettersWithBF-t(): java.util.List
+    public synthetic final method getWithNonTrivialGettersWithBF-x(): int
+    public synthetic final method getWithNonTrivialGettersWithBF-y(): int
+    public synthetic final method getWithNonTrivialGettersWithBF-z(): E
+    public synthetic final method getWithNonTrivialGettersWithBF-z-x(): D
+    public synthetic final method getWithNonTrivialGettersWithBF-z-x-x(): C
+    public synthetic final method getWithNonTrivialGettersWithBF-z-x-x-x(): int
+    public synthetic final method getWithNonTrivialGettersWithBF-z-x-x-y(): int
+    public synthetic final method getWithNonTrivialGettersWithBF-z-x-x-z(): java.lang.String
     public final @org.jetbrains.annotations.NotNull method getWithNonTrivialSetters(): R
-    public synthetic final method getWithNonTrivialSetters-0(): int
-    public synthetic final method getWithNonTrivialSetters-1(): int
-    public synthetic final method getWithNonTrivialSetters-2(): E
-    public synthetic final method getWithNonTrivialSetters-2-0(): D
-    public synthetic final method getWithNonTrivialSetters-2-0-0(): C
-    public synthetic final method getWithNonTrivialSetters-2-0-0-0(): int
-    public synthetic final method getWithNonTrivialSetters-2-0-0-1(): int
-    public synthetic final method getWithNonTrivialSetters-2-0-0-2(): java.lang.String
-    public synthetic final method getWithNonTrivialSetters-3(): java.util.List
+    public synthetic final method getWithNonTrivialSetters-t(): java.util.List
+    public synthetic final method getWithNonTrivialSetters-x(): int
+    public synthetic final method getWithNonTrivialSetters-y(): int
+    public synthetic final method getWithNonTrivialSetters-z(): E
+    public synthetic final method getWithNonTrivialSetters-z-x(): D
+    public synthetic final method getWithNonTrivialSetters-z-x-x(): C
+    public synthetic final method getWithNonTrivialSetters-z-x-x-x(): int
+    public synthetic final method getWithNonTrivialSetters-z-x-x-y(): int
+    public synthetic final method getWithNonTrivialSetters-z-x-x-z(): java.lang.String
     public final @org.jetbrains.annotations.NotNull method getWithNonTrivialSettersWithBF(): R
-    public synthetic final method getWithNonTrivialSettersWithBF-0(): int
-    public synthetic final method getWithNonTrivialSettersWithBF-1(): int
-    public synthetic final method getWithNonTrivialSettersWithBF-2(): E
-    public synthetic final method getWithNonTrivialSettersWithBF-2-0(): D
-    public synthetic final method getWithNonTrivialSettersWithBF-2-0-0(): C
-    public synthetic final method getWithNonTrivialSettersWithBF-2-0-0-0(): int
-    public synthetic final method getWithNonTrivialSettersWithBF-2-0-0-1(): int
-    public synthetic final method getWithNonTrivialSettersWithBF-2-0-0-2(): java.lang.String
-    public synthetic final method getWithNonTrivialSettersWithBF-3(): java.util.List
+    public synthetic final method getWithNonTrivialSettersWithBF-t(): java.util.List
+    public synthetic final method getWithNonTrivialSettersWithBF-x(): int
+    public synthetic final method getWithNonTrivialSettersWithBF-y(): int
+    public synthetic final method getWithNonTrivialSettersWithBF-z(): E
+    public synthetic final method getWithNonTrivialSettersWithBF-z-x(): D
+    public synthetic final method getWithNonTrivialSettersWithBF-z-x-x(): C
+    public synthetic final method getWithNonTrivialSettersWithBF-z-x-x-x(): int
+    public synthetic final method getWithNonTrivialSettersWithBF-z-x-x-y(): int
+    public synthetic final method getWithNonTrivialSettersWithBF-z-x-x-z(): java.lang.String
     public final method getY(): int
     public synthetic bridge method setL(p0: java.lang.Object): void
     public final method setL-sUp7gFk(p0: int, p1: int, p2: int, p3: int, @org.jetbrains.annotations.NotNull p4: java.lang.String, @org.jetbrains.annotations.NotNull p5: java.util.List): void
@@ -284,12 +284,12 @@ public final class NotInlined {
 @kotlin.Metadata
 public final class R {
     // source: 'complex.kt'
-    private final field field-0: int
-    private final field field-1: int
-    private final field field-2-0-0-0: int
-    private final field field-2-0-0-1: int
-    private final @org.jetbrains.annotations.NotNull field field-2-0-0-2: java.lang.String
-    private final @org.jetbrains.annotations.NotNull field field-3: java.util.List
+    private final @org.jetbrains.annotations.NotNull field t: java.util.List
+    private final field x: int
+    private final field y: int
+    private final field z-x-x-x: int
+    private final field z-x-x-y: int
+    private final @org.jetbrains.annotations.NotNull field z-x-x-z: java.lang.String
     private synthetic method <init>(p0: int, p1: int, p2: int, p3: int, p4: java.lang.String, p5: java.util.List): void
     public synthetic final static method box-impl(p0: int, p1: int, p2: int, p3: int, p4: java.lang.String, p5: java.util.List): R
     public final static method constructor-impl(p0: int, p1: int, p2: int, p3: int, @org.jetbrains.annotations.NotNull p4: java.lang.String, @org.jetbrains.annotations.NotNull p5: java.util.List): void
@@ -304,23 +304,23 @@ public final class R {
     public final method getX(): int
     public final method getY-pVg5ArA(): int
     public final @org.jetbrains.annotations.NotNull method getZ(): E
-    public synthetic bridge method getZ-0(): D
-    public synthetic bridge method getZ-0-0(): C
-    public synthetic bridge method getZ-0-0-0(): int
-    public synthetic bridge method getZ-0-0-1(): int
-    public synthetic bridge method getZ-0-0-2(): java.lang.String
+    public synthetic bridge method getZ-x(): D
+    public synthetic bridge method getZ-x-x(): C
+    public synthetic bridge method getZ-x-x-x(): int
+    public synthetic bridge method getZ-x-x-y(): int
+    public synthetic bridge method getZ-x-x-z(): java.lang.String
     public method hashCode(): int
     public static method hashCode-impl(p0: int, p1: int, p2: int, p3: int, p4: java.lang.String, p5: java.util.List): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int, p2: int, p3: int, p4: java.lang.String, p5: java.util.List): java.lang.String
-    public synthetic final method unbox-impl-0(): int
-    public synthetic final method unbox-impl-1(): int
-    public synthetic final method unbox-impl-2(): E
-    public synthetic final method unbox-impl-2-0(): D
-    public synthetic final method unbox-impl-2-0-0(): C
-    public synthetic final method unbox-impl-2-0-0-0(): int
-    public synthetic final method unbox-impl-2-0-0-1(): int
-    public synthetic final method unbox-impl-2-0-0-2(): java.lang.String
-    public synthetic final method unbox-impl-3(): java.util.List
+    public synthetic final method unbox-impl-t(): java.util.List
+    public synthetic final method unbox-impl-x(): int
+    public synthetic final method unbox-impl-y(): int
+    public synthetic final method unbox-impl-z(): E
+    public synthetic final method unbox-impl-z-x(): D
+    public synthetic final method unbox-impl-z-x-x(): C
+    public synthetic final method unbox-impl-z-x-x-x(): int
+    public synthetic final method unbox-impl-z-x-x-y(): int
+    public synthetic final method unbox-impl-z-x-x-z(): java.lang.String
     public final inner class Base1$DefaultImpls
 }

compiler/testData/codegen/box/valueClasses/complex.txt

@@ -41,15 +41,15 @@ public final class B {
 public final class Base1$DefaultImpls {
     // source: 'complex.kt'
     public static @org.jetbrains.annotations.NotNull method getFakeOverrideMFVC(@org.jetbrains.annotations.NotNull p0: Base1): R
-    public synthetic static method getFakeOverrideMFVC-0(p0: Base1): int
-    public synthetic static method getFakeOverrideMFVC-1(p0: Base1): int
-    public synthetic static method getFakeOverrideMFVC-2(p0: Base1): E
-    public synthetic static method getFakeOverrideMFVC-2-0(p0: Base1): D
-    public synthetic static method getFakeOverrideMFVC-2-0-0(p0: Base1): C
-    public synthetic static method getFakeOverrideMFVC-2-0-0-0(p0: Base1): int
-    public synthetic static method getFakeOverrideMFVC-2-0-0-1(p0: Base1): int
-    public synthetic static method getFakeOverrideMFVC-2-0-0-2(p0: Base1): java.lang.String
-    public synthetic static method getFakeOverrideMFVC-3(p0: Base1): java.util.List
+    public synthetic static method getFakeOverrideMFVC-t(p0: Base1): java.util.List
+    public synthetic static method getFakeOverrideMFVC-x(p0: Base1): int
+    public synthetic static method getFakeOverrideMFVC-y(p0: Base1): int
+    public synthetic static method getFakeOverrideMFVC-z(p0: Base1): E
+    public synthetic static method getFakeOverrideMFVC-z-x(p0: Base1): D
+    public synthetic static method getFakeOverrideMFVC-z-x-x(p0: Base1): C
+    public synthetic static method getFakeOverrideMFVC-z-x-x-x(p0: Base1): int
+    public synthetic static method getFakeOverrideMFVC-z-x-x-y(p0: Base1): int
+    public synthetic static method getFakeOverrideMFVC-z-x-x-z(p0: Base1): java.lang.String
     public static method getFakeOverrideRegular(@org.jetbrains.annotations.NotNull p0: Base1): int
     public final inner class Base1$DefaultImpls
 }
@@ -58,15 +58,15 @@ public final class Base1$DefaultImpls {
 public interface Base1 {
     // source: 'complex.kt'
     public abstract @org.jetbrains.annotations.NotNull method getFakeOverrideMFVC(): R
-    public synthetic abstract method getFakeOverrideMFVC-0(): int
-    public synthetic abstract method getFakeOverrideMFVC-1(): int
-    public synthetic abstract method getFakeOverrideMFVC-2(): E
-    public synthetic abstract method getFakeOverrideMFVC-2-0(): D
-    public synthetic abstract method getFakeOverrideMFVC-2-0-0(): C
-    public synthetic abstract method getFakeOverrideMFVC-2-0-0-0(): int
-    public synthetic abstract method getFakeOverrideMFVC-2-0-0-1(): int
-    public synthetic abstract method getFakeOverrideMFVC-2-0-0-2(): java.lang.String
-    public synthetic abstract method getFakeOverrideMFVC-3(): java.util.List
+    public synthetic abstract method getFakeOverrideMFVC-t(): java.util.List
+    public synthetic abstract method getFakeOverrideMFVC-x(): int
+    public synthetic abstract method getFakeOverrideMFVC-y(): int
+    public synthetic abstract method getFakeOverrideMFVC-z(): E
+    public synthetic abstract method getFakeOverrideMFVC-z-x(): D
+    public synthetic abstract method getFakeOverrideMFVC-z-x-x(): C
+    public synthetic abstract method getFakeOverrideMFVC-z-x-x-x(): int
+    public synthetic abstract method getFakeOverrideMFVC-z-x-x-y(): int
+    public synthetic abstract method getFakeOverrideMFVC-z-x-x-z(): java.lang.String
     public abstract method getFakeOverrideRegular(): int
     public final inner class Base1$DefaultImpls
 }
@@ -75,15 +75,15 @@ public interface Base1 {
 public interface Base2 {
     // source: 'complex.kt'
     public abstract @org.jetbrains.annotations.NotNull method getL(): R
-    public synthetic abstract method getL-0(): int
-    public synthetic abstract method getL-1(): int
-    public synthetic abstract method getL-2(): E
-    public synthetic abstract method getL-2-0(): D
-    public synthetic abstract method getL-2-0-0(): C
-    public synthetic abstract method getL-2-0-0-0(): int
-    public synthetic abstract method getL-2-0-0-1(): int
-    public synthetic abstract method getL-2-0-0-2(): java.lang.String
-    public synthetic abstract method getL-3(): java.util.List
+    public synthetic abstract method getL-t(): java.util.List
+    public synthetic abstract method getL-x(): int
+    public synthetic abstract method getL-y(): int
+    public synthetic abstract method getL-z(): E
+    public synthetic abstract method getL-z-x(): D
+    public synthetic abstract method getL-z-x-x(): C
+    public synthetic abstract method getL-z-x-x-x(): int
+    public synthetic abstract method getL-z-x-x-y(): int
+    public synthetic abstract method getL-z-x-x-z(): java.lang.String
     public abstract method setL-sUp7gFk(p0: int, p1: int, p2: int, p3: int, @org.jetbrains.annotations.NotNull p4: java.lang.String, @org.jetbrains.annotations.NotNull p5: java.util.List): void
 }
 
@@ -91,11 +91,11 @@ public interface Base2 {
 public interface Base3 {
     // source: 'complex.kt'
     public abstract @org.jetbrains.annotations.NotNull method getZ(): E
-    public synthetic abstract method getZ-0(): D
-    public synthetic abstract method getZ-0-0(): C
-    public synthetic abstract method getZ-0-0-0(): int
-    public synthetic abstract method getZ-0-0-1(): int
-    public synthetic abstract method getZ-0-0-2(): java.lang.String
+    public synthetic abstract method getZ-x(): D
+    public synthetic abstract method getZ-x-x(): C
+    public synthetic abstract method getZ-x-x-x(): int
+    public synthetic abstract method getZ-x-x-y(): int
+    public synthetic abstract method getZ-x-x-z(): java.lang.String
 }
 
 @kotlin.Metadata
@@ -109,9 +109,9 @@ public interface Base4 {
 @kotlin.Metadata
 public final class C {
     // source: 'complex.kt'
-    private final field field-0: int
-    private final field field-1: int
-    private final @org.jetbrains.annotations.NotNull field field-2: java.lang.String
+    private final field x: int
+    private final field y: int
+    private final @org.jetbrains.annotations.NotNull field z: java.lang.String
     private synthetic method <init>(p0: int, p1: int, p2: java.lang.String): void
     public synthetic final static method box-impl(p0: int, p1: int, p2: java.lang.String): C
     public final static method constructor-impl(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): void
@@ -125,9 +125,9 @@ public final class C {
     public static method hashCode-impl(p0: int, p1: int, p2: java.lang.String): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int, p2: java.lang.String): java.lang.String
-    public synthetic final method unbox-impl-0(): int
-    public synthetic final method unbox-impl-1(): int
-    public synthetic final method unbox-impl-2(): java.lang.String
+    public synthetic final method unbox-impl-x(): int
+    public synthetic final method unbox-impl-y(): int
+    public synthetic final method unbox-impl-z(): java.lang.String
 }
 
 @kotlin.Metadata
@@ -154,9 +154,9 @@ public final class ComplexKt {
 @kotlin.Metadata
 public final class D {
     // source: 'complex.kt'
-    private final field field-0-0: int
-    private final field field-0-1: int
-    private final @org.jetbrains.annotations.NotNull field field-0-2: java.lang.String
+    private final field x-x: int
+    private final field x-y: int
+    private final @org.jetbrains.annotations.NotNull field x-z: java.lang.String
     private synthetic method <init>(p0: int, p1: int, p2: java.lang.String): void
     public synthetic final static method box-impl(p0: int, p1: int, p2: java.lang.String): D
     public final static method constructor-impl(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): void
@@ -169,19 +169,19 @@ public final class D {
     public static method hashCode-impl(p0: int, p1: int, p2: java.lang.String): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int, p2: java.lang.String): java.lang.String
-    public synthetic final method unbox-impl-0(): C
-    public synthetic final method unbox-impl-0-0(): int
-    public synthetic final method unbox-impl-0-1(): int
-    public synthetic final method unbox-impl-0-2(): java.lang.String
+    public synthetic final method unbox-impl-x(): C
+    public synthetic final method unbox-impl-x-x(): int
+    public synthetic final method unbox-impl-x-y(): int
+    public synthetic final method unbox-impl-x-z(): java.lang.String
 }
 
 @kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class E {
     // source: 'complex.kt'
-    private final field field-0-0-0: int
-    private final field field-0-0-1: int
-    private final @org.jetbrains.annotations.NotNull field field-0-0-2: java.lang.String
+    private final field x-x-x: int
+    private final field x-x-y: int
+    private final @org.jetbrains.annotations.NotNull field x-x-z: java.lang.String
     private synthetic method <init>(p0: int, p1: int, p2: java.lang.String): void
     public synthetic final static method box-impl(p0: int, p1: int, p2: java.lang.String): E
     public final static method constructor-impl(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): void
@@ -195,34 +195,34 @@ public final class E {
     public final static method setWithNonTrivialSetters-sUp7gFk(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String, p3: int, p4: int, @org.jetbrains.annotations.NotNull p5: java.lang.String): void
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int, p2: java.lang.String): java.lang.String
-    public synthetic final method unbox-impl-0(): D
-    public synthetic final method unbox-impl-0-0(): C
-    public synthetic final method unbox-impl-0-0-0(): int
-    public synthetic final method unbox-impl-0-0-1(): int
-    public synthetic final method unbox-impl-0-0-2(): java.lang.String
+    public synthetic final method unbox-impl-x(): D
+    public synthetic final method unbox-impl-x-x(): C
+    public synthetic final method unbox-impl-x-x-x(): int
+    public synthetic final method unbox-impl-x-x-y(): int
+    public synthetic final method unbox-impl-x-x-z(): java.lang.String
 }
 
 @kotlin.Metadata
 public final class NotInlined {
     // source: 'complex.kt'
-    private field l-0: int
-    private field l-1: int
-    private field l-2-0-0-0: int
-    private field l-2-0-0-1: int
-    private @org.jetbrains.annotations.NotNull field l-2-0-0-2: java.lang.String
-    private @org.jetbrains.annotations.NotNull field l-3: java.util.List
-    private final field withNonTrivialGettersWithBF-0: int
-    private final field withNonTrivialGettersWithBF-1: int
-    private final field withNonTrivialGettersWithBF-2-0-0-0: int
-    private final field withNonTrivialGettersWithBF-2-0-0-1: int
-    private final @org.jetbrains.annotations.NotNull field withNonTrivialGettersWithBF-2-0-0-2: java.lang.String
-    private final @org.jetbrains.annotations.NotNull field withNonTrivialGettersWithBF-3: java.util.List
-    private field withNonTrivialSettersWithBF-0: int
-    private field withNonTrivialSettersWithBF-1: int
-    private field withNonTrivialSettersWithBF-2-0-0-0: int
-    private field withNonTrivialSettersWithBF-2-0-0-1: int
-    private @org.jetbrains.annotations.NotNull field withNonTrivialSettersWithBF-2-0-0-2: java.lang.String
-    private @org.jetbrains.annotations.NotNull field withNonTrivialSettersWithBF-3: java.util.List
+    private @org.jetbrains.annotations.NotNull field l-t: java.util.List
+    private field l-x: int
+    private field l-y: int
+    private field l-z-x-x-x: int
+    private field l-z-x-x-y: int
+    private @org.jetbrains.annotations.NotNull field l-z-x-x-z: java.lang.String
+    private final @org.jetbrains.annotations.NotNull field withNonTrivialGettersWithBF-t: java.util.List
+    private final field withNonTrivialGettersWithBF-x: int
+    private final field withNonTrivialGettersWithBF-y: int
+    private final field withNonTrivialGettersWithBF-z-x-x-x: int
+    private final field withNonTrivialGettersWithBF-z-x-x-y: int
+    private final @org.jetbrains.annotations.NotNull field withNonTrivialGettersWithBF-z-x-x-z: java.lang.String
+    private @org.jetbrains.annotations.NotNull field withNonTrivialSettersWithBF-t: java.util.List
+    private field withNonTrivialSettersWithBF-x: int
+    private field withNonTrivialSettersWithBF-y: int
+    private field withNonTrivialSettersWithBF-z-x-x-x: int
+    private field withNonTrivialSettersWithBF-z-x-x-y: int
+    private @org.jetbrains.annotations.NotNull field withNonTrivialSettersWithBF-z-x-x-z: java.lang.String
     private field y: int
     private method <init>(p0: int, p1: int, p2: int, p3: int, p4: java.lang.String, p5: java.util.List, p6: int): void
     public synthetic method <init>(p0: int, p1: int, p2: int, p3: int, p4: java.lang.String, p5: java.util.List, p6: int, p7: kotlin.jvm.internal.DefaultConstructorMarker): void
@@ -230,45 +230,45 @@ public final class NotInlined {
     public method getFakeOverrideRegular(): int
     public @org.jetbrains.annotations.NotNull method getL(): R
     public synthetic bridge method getL(): java.lang.Object
-    public synthetic method getL-0(): int
-    public synthetic method getL-1(): int
-    public synthetic method getL-2(): E
-    public synthetic method getL-2-0(): D
-    public synthetic method getL-2-0-0(): C
-    public synthetic method getL-2-0-0-0(): int
-    public synthetic method getL-2-0-0-1(): int
-    public synthetic method getL-2-0-0-2(): java.lang.String
-    public synthetic method getL-3(): java.util.List
+    public synthetic method getL-t(): java.util.List
+    public synthetic method getL-x(): int
+    public synthetic method getL-y(): int
+    public synthetic method getL-z(): E
+    public synthetic method getL-z-x(): D
+    public synthetic method getL-z-x-x(): C
+    public synthetic method getL-z-x-x-x(): int
+    public synthetic method getL-z-x-x-y(): int
+    public synthetic method getL-z-x-x-z(): java.lang.String
     public final @org.jetbrains.annotations.NotNull method getWithNonTrivialGettersWithBF(): R
-    public synthetic final method getWithNonTrivialGettersWithBF-0(): int
-    public synthetic final method getWithNonTrivialGettersWithBF-1(): int
-    public synthetic final method getWithNonTrivialGettersWithBF-2(): E
-    public synthetic final method getWithNonTrivialGettersWithBF-2-0(): D
-    public synthetic final method getWithNonTrivialGettersWithBF-2-0-0(): C
-    public synthetic final method getWithNonTrivialGettersWithBF-2-0-0-0(): int
-    public synthetic final method getWithNonTrivialGettersWithBF-2-0-0-1(): int
-    public synthetic final method getWithNonTrivialGettersWithBF-2-0-0-2(): java.lang.String
-    public synthetic final method getWithNonTrivialGettersWithBF-3(): java.util.List
+    public synthetic final method getWithNonTrivialGettersWithBF-t(): java.util.List
+    public synthetic final method getWithNonTrivialGettersWithBF-x(): int
+    public synthetic final method getWithNonTrivialGettersWithBF-y(): int
+    public synthetic final method getWithNonTrivialGettersWithBF-z(): E
+    public synthetic final method getWithNonTrivialGettersWithBF-z-x(): D
+    public synthetic final method getWithNonTrivialGettersWithBF-z-x-x(): C
+    public synthetic final method getWithNonTrivialGettersWithBF-z-x-x-x(): int
+    public synthetic final method getWithNonTrivialGettersWithBF-z-x-x-y(): int
+    public synthetic final method getWithNonTrivialGettersWithBF-z-x-x-z(): java.lang.String
     public final @org.jetbrains.annotations.NotNull method getWithNonTrivialSetters(): R
-    public synthetic final method getWithNonTrivialSetters-0(): int
-    public synthetic final method getWithNonTrivialSetters-1(): int
-    public synthetic final method getWithNonTrivialSetters-2(): E
-    public synthetic final method getWithNonTrivialSetters-2-0(): D
-    public synthetic final method getWithNonTrivialSetters-2-0-0(): C
-    public synthetic final method getWithNonTrivialSetters-2-0-0-0(): int
-    public synthetic final method getWithNonTrivialSetters-2-0-0-1(): int
-    public synthetic final method getWithNonTrivialSetters-2-0-0-2(): java.lang.String
-    public synthetic final method getWithNonTrivialSetters-3(): java.util.List
+    public synthetic final method getWithNonTrivialSetters-t(): java.util.List
+    public synthetic final method getWithNonTrivialSetters-x(): int
+    public synthetic final method getWithNonTrivialSetters-y(): int
+    public synthetic final method getWithNonTrivialSetters-z(): E
+    public synthetic final method getWithNonTrivialSetters-z-x(): D
+    public synthetic final method getWithNonTrivialSetters-z-x-x(): C
+    public synthetic final method getWithNonTrivialSetters-z-x-x-x(): int
+    public synthetic final method getWithNonTrivialSetters-z-x-x-y(): int
+    public synthetic final method getWithNonTrivialSetters-z-x-x-z(): java.lang.String
     public final @org.jetbrains.annotations.NotNull method getWithNonTrivialSettersWithBF(): R
-    public synthetic final method getWithNonTrivialSettersWithBF-0(): int
-    public synthetic final method getWithNonTrivialSettersWithBF-1(): int
-    public synthetic final method getWithNonTrivialSettersWithBF-2(): E
-    public synthetic final method getWithNonTrivialSettersWithBF-2-0(): D
-    public synthetic final method getWithNonTrivialSettersWithBF-2-0-0(): C
-    public synthetic final method getWithNonTrivialSettersWithBF-2-0-0-0(): int
-    public synthetic final method getWithNonTrivialSettersWithBF-2-0-0-1(): int
-    public synthetic final method getWithNonTrivialSettersWithBF-2-0-0-2(): java.lang.String
-    public synthetic final method getWithNonTrivialSettersWithBF-3(): java.util.List
+    public synthetic final method getWithNonTrivialSettersWithBF-t(): java.util.List
+    public synthetic final method getWithNonTrivialSettersWithBF-x(): int
+    public synthetic final method getWithNonTrivialSettersWithBF-y(): int
+    public synthetic final method getWithNonTrivialSettersWithBF-z(): E
+    public synthetic final method getWithNonTrivialSettersWithBF-z-x(): D
+    public synthetic final method getWithNonTrivialSettersWithBF-z-x-x(): C
+    public synthetic final method getWithNonTrivialSettersWithBF-z-x-x-x(): int
+    public synthetic final method getWithNonTrivialSettersWithBF-z-x-x-y(): int
+    public synthetic final method getWithNonTrivialSettersWithBF-z-x-x-z(): java.lang.String
     public final method getY(): int
     public synthetic bridge method setL(p0: java.lang.Object): void
     public method setL-sUp7gFk(p0: int, p1: int, p2: int, p3: int, @org.jetbrains.annotations.NotNull p4: java.lang.String, @org.jetbrains.annotations.NotNull p5: java.util.List): void
@@ -284,12 +284,12 @@ public final class NotInlined {
 @kotlin.Metadata
 public final class R {
     // source: 'complex.kt'
-    private final field field-0: int
-    private final field field-1: int
-    private final field field-2-0-0-0: int
-    private final field field-2-0-0-1: int
-    private final @org.jetbrains.annotations.NotNull field field-2-0-0-2: java.lang.String
-    private final @org.jetbrains.annotations.NotNull field field-3: java.util.List
+    private final @org.jetbrains.annotations.NotNull field t: java.util.List
+    private final field x: int
+    private final field y: int
+    private final field z-x-x-x: int
+    private final field z-x-x-y: int
+    private final @org.jetbrains.annotations.NotNull field z-x-x-z: java.lang.String
     private synthetic method <init>(p0: int, p1: int, p2: int, p3: int, p4: java.lang.String, p5: java.util.List): void
     public synthetic final static method box-impl(p0: int, p1: int, p2: int, p3: int, p4: java.lang.String, p5: java.util.List): R
     public final static method constructor-impl(p0: int, p1: int, p2: int, p3: int, @org.jetbrains.annotations.NotNull p4: java.lang.String, @org.jetbrains.annotations.NotNull p5: java.util.List): void
@@ -304,23 +304,23 @@ public final class R {
     public final method getX(): int
     public final method getY-pVg5ArA(): int
     public @org.jetbrains.annotations.NotNull method getZ(): E
-    public synthetic bridge method getZ-0(): D
-    public synthetic bridge method getZ-0-0(): C
-    public synthetic bridge method getZ-0-0-0(): int
-    public synthetic bridge method getZ-0-0-1(): int
-    public synthetic bridge method getZ-0-0-2(): java.lang.String
+    public synthetic bridge method getZ-x(): D
+    public synthetic bridge method getZ-x-x(): C
+    public synthetic bridge method getZ-x-x-x(): int
+    public synthetic bridge method getZ-x-x-y(): int
+    public synthetic bridge method getZ-x-x-z(): java.lang.String
     public method hashCode(): int
     public static method hashCode-impl(p0: int, p1: int, p2: int, p3: int, p4: java.lang.String, p5: java.util.List): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int, p2: int, p3: int, p4: java.lang.String, p5: java.util.List): java.lang.String
-    public synthetic final method unbox-impl-0(): int
-    public synthetic final method unbox-impl-1(): int
-    public synthetic final method unbox-impl-2(): E
-    public synthetic final method unbox-impl-2-0(): D
-    public synthetic final method unbox-impl-2-0-0(): C
-    public synthetic final method unbox-impl-2-0-0-0(): int
-    public synthetic final method unbox-impl-2-0-0-1(): int
-    public synthetic final method unbox-impl-2-0-0-2(): java.lang.String
-    public synthetic final method unbox-impl-3(): java.util.List
+    public synthetic final method unbox-impl-t(): java.util.List
+    public synthetic final method unbox-impl-x(): int
+    public synthetic final method unbox-impl-y(): int
+    public synthetic final method unbox-impl-z(): E
+    public synthetic final method unbox-impl-z-x(): D
+    public synthetic final method unbox-impl-z-x-x(): C
+    public synthetic final method unbox-impl-z-x-x-x(): int
+    public synthetic final method unbox-impl-z-x-x-y(): int
+    public synthetic final method unbox-impl-z-x-x-z(): java.lang.String
     public final inner class Base1$DefaultImpls
 }

compiler/testData/codegen/box/valueClasses/conditionalExpressions.txt

@@ -26,8 +26,8 @@ public final class DPoint {
     // source: 'conditionalExpressions.kt'
     public final static @org.jetbrains.annotations.NotNull field Companion: DPoint$Companion
     private static field counter: int
-    private final field field-0: double
-    private final field field-1: double
+    private final field x: double
+    private final field y: double
     static method <clinit>(): void
     private synthetic method <init>(p0: double, p1: double): void
     public synthetic final static method access$getCounter$cp(): int
@@ -45,7 +45,7 @@ public final class DPoint {
     public final static method setCounter(p0: int): void
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: double, p1: double): java.lang.String
-    public synthetic final method unbox-impl-0(): double
-    public synthetic final method unbox-impl-1(): double
+    public synthetic final method unbox-impl-x(): double
+    public synthetic final method unbox-impl-y(): double
     public final inner class DPoint$Companion
 }

compiler/testData/codegen/box/valueClasses/defaultParameters.fir.txt

@@ -2,8 +2,8 @@
 @kotlin.Metadata
 public final class DPoint {
     // source: 'defaultParameters.kt'
-    private final field field-0: double
-    private final field field-1: double
+    private final field x: double
+    private final field y: double
     private synthetic method <init>(p0: double, p1: double): void
     public synthetic final static method box-impl(p0: double, p1: double): DPoint
     public final static method constructor-impl(p0: double, p1: double): void
@@ -18,19 +18,19 @@ public final class DPoint {
     public static method hashCode-impl(p0: double, p1: double): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: double, p1: double): java.lang.String
-    public synthetic final method unbox-impl-0(): double
-    public synthetic final method unbox-impl-1(): double
+    public synthetic final method unbox-impl-x(): double
+    public synthetic final method unbox-impl-y(): double
 }
 
 @kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class DSegment {
     // source: 'defaultParameters.kt'
-    private final field field-0-0: double
-    private final field field-0-1: double
-    private final field field-1-0: double
-    private final field field-1-1: double
-    private final field field-2: int
+    private final field n: int
+    private final field p1-x: double
+    private final field p1-y: double
+    private final field p2-x: double
+    private final field p2-y: double
     private synthetic method <init>(p0: double, p1: double, p2: double, p3: double, p4: int): void
     public synthetic final static method box-impl(p0: double, p1: double, p2: double, p3: double, p4: int): DSegment
     public final static method constructor-impl(p0: double, p1: double, p2: double, p3: double, p4: int): void
@@ -46,13 +46,13 @@ public final class DSegment {
     public static method hashCode-impl(p0: double, p1: double, p2: double, p3: double, p4: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: double, p1: double, p2: double, p3: double, p4: int): java.lang.String
-    public synthetic final method unbox-impl-0(): DPoint
-    public synthetic final method unbox-impl-0-0(): double
-    public synthetic final method unbox-impl-0-1(): double
-    public synthetic final method unbox-impl-1(): DPoint
-    public synthetic final method unbox-impl-1-0(): double
-    public synthetic final method unbox-impl-1-1(): double
-    public synthetic final method unbox-impl-2(): int
+    public synthetic final method unbox-impl-n(): int
+    public synthetic final method unbox-impl-p1(): DPoint
+    public synthetic final method unbox-impl-p1-x(): double
+    public synthetic final method unbox-impl-p1-y(): double
+    public synthetic final method unbox-impl-p2(): DPoint
+    public synthetic final method unbox-impl-p2-x(): double
+    public synthetic final method unbox-impl-p2-y(): double
 }
 
 @kotlin.Metadata
@@ -70,11 +70,11 @@ public final class DefaultParametersKt {
 public final class Wrapper {
     // source: 'defaultParameters.kt'
     private final field n: int
-    private final field segment-0-0: double
-    private final field segment-0-1: double
-    private final field segment-1-0: double
-    private final field segment-1-1: double
-    private final field segment-2: int
+    private final field segment-n: int
+    private final field segment-p1-x: double
+    private final field segment-p1-y: double
+    private final field segment-p2-x: double
+    private final field segment-p2-y: double
     public method <init>(): void
     public method <init>(p0: double, p1: double, p2: double, p3: double, p4: int, p5: int): void
     public synthetic method <init>(p0: double, p1: double, p2: double, p3: double, p4: int, p5: int, p6: int, p7: kotlin.jvm.internal.DefaultConstructorMarker): void
@@ -87,13 +87,13 @@ public final class Wrapper {
     public final @org.jetbrains.annotations.NotNull method f3-lIoT8es(p0: int, p1: int, p2: double, p3: double): java.util.List
     public final method getN(): int
     public final @org.jetbrains.annotations.NotNull method getSegment(): DSegment
-    public synthetic final method getSegment-0(): DPoint
-    public synthetic final method getSegment-0-0(): double
-    public synthetic final method getSegment-0-1(): double
-    public synthetic final method getSegment-1(): DPoint
-    public synthetic final method getSegment-1-0(): double
-    public synthetic final method getSegment-1-1(): double
-    public synthetic final method getSegment-2(): int
+    public synthetic final method getSegment-n(): int
+    public synthetic final method getSegment-p1(): DPoint
+    public synthetic final method getSegment-p1-x(): double
+    public synthetic final method getSegment-p1-y(): double
+    public synthetic final method getSegment-p2(): DPoint
+    public synthetic final method getSegment-p2-x(): double
+    public synthetic final method getSegment-p2-y(): double
     public method hashCode(): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
 }

compiler/testData/codegen/box/valueClasses/defaultParameters.txt

@@ -2,8 +2,8 @@
 @kotlin.Metadata
 public final class DPoint {
     // source: 'defaultParameters.kt'
-    private final field field-0: double
-    private final field field-1: double
+    private final field x: double
+    private final field y: double
     private synthetic method <init>(p0: double, p1: double): void
     public synthetic final static method box-impl(p0: double, p1: double): DPoint
     public final static method constructor-impl(p0: double, p1: double): void
@@ -18,19 +18,19 @@ public final class DPoint {
     public static method hashCode-impl(p0: double, p1: double): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: double, p1: double): java.lang.String
-    public synthetic final method unbox-impl-0(): double
-    public synthetic final method unbox-impl-1(): double
+    public synthetic final method unbox-impl-x(): double
+    public synthetic final method unbox-impl-y(): double
 }
 
 @kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class DSegment {
     // source: 'defaultParameters.kt'
-    private final field field-0-0: double
-    private final field field-0-1: double
-    private final field field-1-0: double
-    private final field field-1-1: double
-    private final field field-2: int
+    private final field n: int
+    private final field p1-x: double
+    private final field p1-y: double
+    private final field p2-x: double
+    private final field p2-y: double
     private synthetic method <init>(p0: double, p1: double, p2: double, p3: double, p4: int): void
     public synthetic final static method box-impl(p0: double, p1: double, p2: double, p3: double, p4: int): DSegment
     public final static method constructor-impl(p0: double, p1: double, p2: double, p3: double, p4: int): void
@@ -46,13 +46,13 @@ public final class DSegment {
     public static method hashCode-impl(p0: double, p1: double, p2: double, p3: double, p4: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: double, p1: double, p2: double, p3: double, p4: int): java.lang.String
-    public synthetic final method unbox-impl-0(): DPoint
-    public synthetic final method unbox-impl-0-0(): double
-    public synthetic final method unbox-impl-0-1(): double
-    public synthetic final method unbox-impl-1(): DPoint
-    public synthetic final method unbox-impl-1-0(): double
-    public synthetic final method unbox-impl-1-1(): double
-    public synthetic final method unbox-impl-2(): int
+    public synthetic final method unbox-impl-n(): int
+    public synthetic final method unbox-impl-p1(): DPoint
+    public synthetic final method unbox-impl-p1-x(): double
+    public synthetic final method unbox-impl-p1-y(): double
+    public synthetic final method unbox-impl-p2(): DPoint
+    public synthetic final method unbox-impl-p2-x(): double
+    public synthetic final method unbox-impl-p2-y(): double
 }
 
 @kotlin.Metadata
@@ -70,11 +70,11 @@ public final class DefaultParametersKt {
 public final class Wrapper {
     // source: 'defaultParameters.kt'
     private final field n: int
-    private final field segment-0-0: double
-    private final field segment-0-1: double
-    private final field segment-1-0: double
-    private final field segment-1-1: double
-    private final field segment-2: int
+    private final field segment-n: int
+    private final field segment-p1-x: double
+    private final field segment-p1-y: double
+    private final field segment-p2-x: double
+    private final field segment-p2-y: double
     public method <init>(): void
     public method <init>(p0: double, p1: double, p2: double, p3: double, p4: int, p5: int): void
     public synthetic method <init>(p0: double, p1: double, p2: double, p3: double, p4: int, p5: int, p6: int, p7: kotlin.jvm.internal.DefaultConstructorMarker): void
@@ -87,13 +87,13 @@ public final class Wrapper {
     public final @org.jetbrains.annotations.NotNull method f3-lIoT8es(p0: int, p1: int, p2: double, p3: double): java.util.List
     public final method getN(): int
     public final @org.jetbrains.annotations.NotNull method getSegment(): DSegment
-    public synthetic final method getSegment-0(): DPoint
-    public synthetic final method getSegment-0-0(): double
-    public synthetic final method getSegment-0-1(): double
-    public synthetic final method getSegment-1(): DPoint
-    public synthetic final method getSegment-1-0(): double
-    public synthetic final method getSegment-1-1(): double
-    public synthetic final method getSegment-2(): int
+    public synthetic final method getSegment-n(): int
+    public synthetic final method getSegment-p1(): DPoint
+    public synthetic final method getSegment-p1-x(): double
+    public synthetic final method getSegment-p1-y(): double
+    public synthetic final method getSegment-p2(): DPoint
+    public synthetic final method getSegment-p2-x(): double
+    public synthetic final method getSegment-p2-y(): double
     public method hashCode(): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
 }

compiler/testData/codegen/box/valueClasses/delegating.fir.txt

@@ -2,8 +2,8 @@
 @kotlin.Metadata
 public final class A {
     // source: 'delegating.kt'
-    private final field field-0: int
-    private final field field-1: int
+    private final field x: int
+    private final field y: int
     private synthetic method <init>(p0: int, p1: int): void
     public synthetic final static method box-impl(p0: int, p1: int): A
     public final static method constructor-impl(p0: int, p1: int): void
@@ -17,8 +17,8 @@ public final class A {
     public static method hashCode-impl(p0: int, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int): java.lang.String
-    public synthetic final method unbox-impl-0(): int
-    public synthetic final method unbox-impl-1(): int
+    public synthetic final method unbox-impl-x(): int
+    public synthetic final method unbox-impl-y(): int
 }
 
 @kotlin.Metadata
@@ -44,26 +44,26 @@ public final class B {
     // source: 'delegating.kt'
     synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[]
     private final @org.jetbrains.annotations.NotNull field a$delegate: kotlin.Lazy
-    private final field b$delegate-0: int
-    private final field b$delegate-1: int
-    private field x-0: int
-    private field x-1: int
+    private final field b$delegate-x: int
+    private final field b$delegate-y: int
+    private field x-x: int
+    private field x-y: int
     private @org.jetbrains.annotations.Nullable field y: A
     inner (anonymous) class B$a$2
     static method <clinit>(): void
     private method <init>(p0: int, p1: int, p2: A): void
     public synthetic method <init>(p0: int, p1: int, p2: A, p3: kotlin.jvm.internal.DefaultConstructorMarker): void
     public final @org.jetbrains.annotations.NotNull method getA(): A
-    public synthetic final method getA-0(): int
-    public synthetic final method getA-1(): int
+    public synthetic final method getA-x(): int
+    public synthetic final method getA-y(): int
     public final method getB(): int
     private static method getC$delegate(p0: B): java.lang.Object
     public final @org.jetbrains.annotations.NotNull method getC(): A
-    public synthetic final method getC-0(): int
-    public synthetic final method getC-1(): int
+    public synthetic final method getC-x(): int
+    public synthetic final method getC-y(): int
     public final @org.jetbrains.annotations.NotNull method getX(): A
-    public synthetic final method getX-0(): int
-    public synthetic final method getX-1(): int
+    public synthetic final method getX-x(): int
+    public synthetic final method getX-y(): int
     public final @org.jetbrains.annotations.Nullable method getY(): A
     public final method setX-sUp7gFk(p0: int, p1: int): void
     public final method setY(@org.jetbrains.annotations.Nullable p0: A): void
@@ -72,8 +72,8 @@ public final class B {
 @kotlin.Metadata
 public final class C {
     // source: 'delegating.kt'
-    private synthetic final field <$$delegate_0-0>: int
-    private synthetic final field <$$delegate_0-1>: int
+    private synthetic final field <$$delegate_0-x>: int
+    private synthetic final field <$$delegate_0-y>: int
     public method <init>(p0: int, p1: int): void
     public method getX(): int
 }

compiler/testData/codegen/box/valueClasses/delegating.txt

@@ -2,8 +2,8 @@
 @kotlin.Metadata
 public final class A {
     // source: 'delegating.kt'
-    private final field field-0: int
-    private final field field-1: int
+    private final field x: int
+    private final field y: int
     private synthetic method <init>(p0: int, p1: int): void
     public synthetic final static method box-impl(p0: int, p1: int): A
     public final static method constructor-impl(p0: int, p1: int): void
@@ -17,8 +17,8 @@ public final class A {
     public static method hashCode-impl(p0: int, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int): java.lang.String
-    public synthetic final method unbox-impl-0(): int
-    public synthetic final method unbox-impl-1(): int
+    public synthetic final method unbox-impl-x(): int
+    public synthetic final method unbox-impl-y(): int
 }
 
 @kotlin.Metadata
@@ -44,26 +44,26 @@ public final class B {
     // source: 'delegating.kt'
     synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[]
     private final @org.jetbrains.annotations.NotNull field a$delegate: kotlin.Lazy
-    private final field b$delegate-0: int
-    private final field b$delegate-1: int
-    private field x-0: int
-    private field x-1: int
+    private final field b$delegate-x: int
+    private final field b$delegate-y: int
+    private field x-x: int
+    private field x-y: int
     private @org.jetbrains.annotations.Nullable field y: A
     inner (anonymous) class B$a$2
     static method <clinit>(): void
     private method <init>(p0: int, p1: int, p2: A): void
     public synthetic method <init>(p0: int, p1: int, p2: A, p3: kotlin.jvm.internal.DefaultConstructorMarker): void
     public final @org.jetbrains.annotations.NotNull method getA(): A
-    public synthetic final method getA-0(): int
-    public synthetic final method getA-1(): int
+    public synthetic final method getA-x(): int
+    public synthetic final method getA-y(): int
     public final method getB(): int
     private static method getC$delegate(p0: B): java.lang.Object
     public final @org.jetbrains.annotations.NotNull method getC(): A
-    public synthetic final method getC-0(): int
-    public synthetic final method getC-1(): int
+    public synthetic final method getC-x(): int
+    public synthetic final method getC-y(): int
     public final @org.jetbrains.annotations.NotNull method getX(): A
-    public synthetic final method getX-0(): int
-    public synthetic final method getX-1(): int
+    public synthetic final method getX-x(): int
+    public synthetic final method getX-y(): int
     public final @org.jetbrains.annotations.Nullable method getY(): A
     public final method setX-sUp7gFk(p0: int, p1: int): void
     public final method setY(@org.jetbrains.annotations.Nullable p0: A): void
@@ -72,8 +72,8 @@ public final class B {
 @kotlin.Metadata
 public final class C {
     // source: 'delegating.kt'
-    private synthetic final field $$delegate_0-0: int
-    private synthetic final field $$delegate_0-1: int
+    private synthetic final field $$delegate_0-x: int
+    private synthetic final field $$delegate_0-y: int
     public method <init>(p0: int, p1: int): void
     public method getX(): int
 }

compiler/testData/codegen/box/valueClasses/equality.fir.txt

@@ -2,16 +2,16 @@
 @kotlin.Metadata
 public final class A {
     // source: 'equality.kt'
-    private final field field-0: int
-    private final field field-1: int
-    private final field field-2-0: int
-    private final field field-2-1: int
-    private final field field-3: int
-    private final field field-4: int
-    private final @org.jetbrains.annotations.NotNull field field-5: java.lang.String
-    private final field field-6: int
-    private final field field-7: int
-    private final @org.jetbrains.annotations.NotNull field field-8: java.lang.String
+    private final field f1: int
+    private final field f2: int
+    private final field f3-x: int
+    private final field f3-y: int
+    private final field f4: int
+    private final field f5: int
+    private final @org.jetbrains.annotations.NotNull field f6: java.lang.String
+    private final field f7: int
+    private final field f8: int
+    private final @org.jetbrains.annotations.NotNull field f9: java.lang.String
     private synthetic method <init>(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String): void
     public synthetic final static method box-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String): A
     public final static method constructor-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, @org.jetbrains.annotations.NotNull p6: java.lang.String, p7: int, p8: int, @org.jetbrains.annotations.NotNull p9: java.lang.String): void
@@ -31,43 +31,43 @@ public final class A {
     public static method hashCode-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String): java.lang.String
-    public synthetic final method unbox-impl-0(): int
-    public synthetic final method unbox-impl-1(): int
-    public synthetic final method unbox-impl-2(): F3
-    public synthetic final method unbox-impl-2-0(): int
-    public synthetic final method unbox-impl-2-1(): int
-    public synthetic final method unbox-impl-3(): int
-    public synthetic final method unbox-impl-4(): int
-    public synthetic final method unbox-impl-5(): java.lang.String
-    public synthetic final method unbox-impl-6(): int
-    public synthetic final method unbox-impl-7(): int
-    public synthetic final method unbox-impl-8(): java.lang.String
+    public synthetic final method unbox-impl-f1(): int
+    public synthetic final method unbox-impl-f2(): int
+    public synthetic final method unbox-impl-f3(): F3
+    public synthetic final method unbox-impl-f3-x(): int
+    public synthetic final method unbox-impl-f3-y(): int
+    public synthetic final method unbox-impl-f4(): int
+    public synthetic final method unbox-impl-f5(): int
+    public synthetic final method unbox-impl-f6(): java.lang.String
+    public synthetic final method unbox-impl-f7(): int
+    public synthetic final method unbox-impl-f8(): int
+    public synthetic final method unbox-impl-f9(): java.lang.String
 }
 
 @kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class B {
     // source: 'equality.kt'
-    private final field field-0-0: int
-    private final field field-0-1: int
-    private final field field-0-2-0: int
-    private final field field-0-2-1: int
-    private final field field-0-3: int
-    private final field field-0-4: int
-    private final @org.jetbrains.annotations.NotNull field field-0-5: java.lang.String
-    private final field field-0-6: int
-    private final field field-0-7: int
-    private final @org.jetbrains.annotations.NotNull field field-0-8: java.lang.String
-    private final field field-1-0: int
-    private final field field-1-1: int
-    private final field field-1-2-0: int
-    private final field field-1-2-1: int
-    private final field field-1-3: int
-    private final field field-1-4: int
-    private final @org.jetbrains.annotations.NotNull field field-1-5: java.lang.String
-    private final field field-1-6: int
-    private final field field-1-7: int
-    private final @org.jetbrains.annotations.NotNull field field-1-8: java.lang.String
+    private final field a1-f1: int
+    private final field a1-f2: int
+    private final field a1-f3-x: int
+    private final field a1-f3-y: int
+    private final field a1-f4: int
+    private final field a1-f5: int
+    private final @org.jetbrains.annotations.NotNull field a1-f6: java.lang.String
+    private final field a1-f7: int
+    private final field a1-f8: int
+    private final @org.jetbrains.annotations.NotNull field a1-f9: java.lang.String
+    private final field a2-f1: int
+    private final field a2-f2: int
+    private final field a2-f3-x: int
+    private final field a2-f3-y: int
+    private final field a2-f4: int
+    private final field a2-f5: int
+    private final @org.jetbrains.annotations.NotNull field a2-f6: java.lang.String
+    private final field a2-f7: int
+    private final field a2-f8: int
+    private final @org.jetbrains.annotations.NotNull field a2-f9: java.lang.String
     private synthetic method <init>(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String, p10: int, p11: int, p12: int, p13: int, p14: int, p15: int, p16: java.lang.String, p17: int, p18: int, p19: java.lang.String): void
     public synthetic final static method box-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String, p10: int, p11: int, p12: int, p13: int, p14: int, p15: int, p16: java.lang.String, p17: int, p18: int, p19: java.lang.String): B
     public final static method constructor-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, @org.jetbrains.annotations.NotNull p6: java.lang.String, p7: int, p8: int, @org.jetbrains.annotations.NotNull p9: java.lang.String, p10: int, p11: int, p12: int, p13: int, p14: int, p15: int, @org.jetbrains.annotations.NotNull p16: java.lang.String, p17: int, p18: int, @org.jetbrains.annotations.NotNull p19: java.lang.String): void
@@ -80,30 +80,30 @@ public final class B {
     public static method hashCode-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String, p10: int, p11: int, p12: int, p13: int, p14: int, p15: int, p16: java.lang.String, p17: int, p18: int, p19: java.lang.String): int
     public final @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public final static @org.jetbrains.annotations.NotNull method toString-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, @org.jetbrains.annotations.NotNull p6: java.lang.String, p7: int, p8: int, @org.jetbrains.annotations.NotNull p9: java.lang.String, p10: int, p11: int, p12: int, p13: int, p14: int, p15: int, @org.jetbrains.annotations.NotNull p16: java.lang.String, p17: int, p18: int, @org.jetbrains.annotations.NotNull p19: java.lang.String): java.lang.String
-    public synthetic final method unbox-impl-0(): A
-    public synthetic final method unbox-impl-0-0(): int
-    public synthetic final method unbox-impl-0-1(): int
-    public synthetic final method unbox-impl-0-2(): F3
-    public synthetic final method unbox-impl-0-2-0(): int
-    public synthetic final method unbox-impl-0-2-1(): int
-    public synthetic final method unbox-impl-0-3(): int
-    public synthetic final method unbox-impl-0-4(): int
-    public synthetic final method unbox-impl-0-5(): java.lang.String
-    public synthetic final method unbox-impl-0-6(): int
-    public synthetic final method unbox-impl-0-7(): int
-    public synthetic final method unbox-impl-0-8(): java.lang.String
-    public synthetic final method unbox-impl-1(): A
-    public synthetic final method unbox-impl-1-0(): int
-    public synthetic final method unbox-impl-1-1(): int
-    public synthetic final method unbox-impl-1-2(): F3
-    public synthetic final method unbox-impl-1-2-0(): int
-    public synthetic final method unbox-impl-1-2-1(): int
-    public synthetic final method unbox-impl-1-3(): int
-    public synthetic final method unbox-impl-1-4(): int
-    public synthetic final method unbox-impl-1-5(): java.lang.String
-    public synthetic final method unbox-impl-1-6(): int
-    public synthetic final method unbox-impl-1-7(): int
-    public synthetic final method unbox-impl-1-8(): java.lang.String
+    public synthetic final method unbox-impl-a1(): A
+    public synthetic final method unbox-impl-a1-f1(): int
+    public synthetic final method unbox-impl-a1-f2(): int
+    public synthetic final method unbox-impl-a1-f3(): F3
+    public synthetic final method unbox-impl-a1-f3-x(): int
+    public synthetic final method unbox-impl-a1-f3-y(): int
+    public synthetic final method unbox-impl-a1-f4(): int
+    public synthetic final method unbox-impl-a1-f5(): int
+    public synthetic final method unbox-impl-a1-f6(): java.lang.String
+    public synthetic final method unbox-impl-a1-f7(): int
+    public synthetic final method unbox-impl-a1-f8(): int
+    public synthetic final method unbox-impl-a1-f9(): java.lang.String
+    public synthetic final method unbox-impl-a2(): A
+    public synthetic final method unbox-impl-a2-f1(): int
+    public synthetic final method unbox-impl-a2-f2(): int
+    public synthetic final method unbox-impl-a2-f3(): F3
+    public synthetic final method unbox-impl-a2-f3-x(): int
+    public synthetic final method unbox-impl-a2-f3-y(): int
+    public synthetic final method unbox-impl-a2-f4(): int
+    public synthetic final method unbox-impl-a2-f5(): int
+    public synthetic final method unbox-impl-a2-f6(): java.lang.String
+    public synthetic final method unbox-impl-a2-f7(): int
+    public synthetic final method unbox-impl-a2-f8(): int
+    public synthetic final method unbox-impl-a2-f9(): java.lang.String
 }
 
 @kotlin.Metadata
@@ -154,8 +154,8 @@ public final class F2 {
 @kotlin.Metadata
 public final class F3 {
     // source: 'equality.kt'
-    private final field field-0: int
-    private final field field-1: int
+    private final field x: int
+    private final field y: int
     private synthetic method <init>(p0: int, p1: int): void
     public synthetic final static method box-impl(p0: int, p1: int): F3
     public final static method constructor-impl(p0: int, p1: int): void
@@ -168,8 +168,8 @@ public final class F3 {
     public static method hashCode-impl(p0: int, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int): java.lang.String
-    public synthetic final method unbox-impl-0(): int
-    public synthetic final method unbox-impl-1(): int
+    public synthetic final method unbox-impl-x(): int
+    public synthetic final method unbox-impl-y(): int
 }
 
 @kotlin.jvm.JvmInline

compiler/testData/codegen/box/valueClasses/equality.txt

@@ -2,16 +2,16 @@
 @kotlin.Metadata
 public final class A {
     // source: 'equality.kt'
-    private final field field-0: int
-    private final field field-1: int
-    private final field field-2-0: int
-    private final field field-2-1: int
-    private final field field-3: int
-    private final field field-4: int
-    private final @org.jetbrains.annotations.NotNull field field-5: java.lang.String
-    private final field field-6: int
-    private final field field-7: int
-    private final @org.jetbrains.annotations.NotNull field field-8: java.lang.String
+    private final field f1: int
+    private final field f2: int
+    private final field f3-x: int
+    private final field f3-y: int
+    private final field f4: int
+    private final field f5: int
+    private final @org.jetbrains.annotations.NotNull field f6: java.lang.String
+    private final field f7: int
+    private final field f8: int
+    private final @org.jetbrains.annotations.NotNull field f9: java.lang.String
     private synthetic method <init>(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String): void
     public synthetic final static method box-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String): A
     public final static method constructor-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, @org.jetbrains.annotations.NotNull p6: java.lang.String, p7: int, p8: int, @org.jetbrains.annotations.NotNull p9: java.lang.String): void
@@ -31,43 +31,43 @@ public final class A {
     public static method hashCode-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String): java.lang.String
-    public synthetic final method unbox-impl-0(): int
-    public synthetic final method unbox-impl-1(): int
-    public synthetic final method unbox-impl-2(): F3
-    public synthetic final method unbox-impl-2-0(): int
-    public synthetic final method unbox-impl-2-1(): int
-    public synthetic final method unbox-impl-3(): int
-    public synthetic final method unbox-impl-4(): int
-    public synthetic final method unbox-impl-5(): java.lang.String
-    public synthetic final method unbox-impl-6(): int
-    public synthetic final method unbox-impl-7(): int
-    public synthetic final method unbox-impl-8(): java.lang.String
+    public synthetic final method unbox-impl-f1(): int
+    public synthetic final method unbox-impl-f2(): int
+    public synthetic final method unbox-impl-f3(): F3
+    public synthetic final method unbox-impl-f3-x(): int
+    public synthetic final method unbox-impl-f3-y(): int
+    public synthetic final method unbox-impl-f4(): int
+    public synthetic final method unbox-impl-f5(): int
+    public synthetic final method unbox-impl-f6(): java.lang.String
+    public synthetic final method unbox-impl-f7(): int
+    public synthetic final method unbox-impl-f8(): int
+    public synthetic final method unbox-impl-f9(): java.lang.String
 }
 
 @kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class B {
     // source: 'equality.kt'
-    private final field field-0-0: int
-    private final field field-0-1: int
-    private final field field-0-2-0: int
-    private final field field-0-2-1: int
-    private final field field-0-3: int
-    private final field field-0-4: int
-    private final @org.jetbrains.annotations.NotNull field field-0-5: java.lang.String
-    private final field field-0-6: int
-    private final field field-0-7: int
-    private final @org.jetbrains.annotations.NotNull field field-0-8: java.lang.String
-    private final field field-1-0: int
-    private final field field-1-1: int
-    private final field field-1-2-0: int
-    private final field field-1-2-1: int
-    private final field field-1-3: int
-    private final field field-1-4: int
-    private final @org.jetbrains.annotations.NotNull field field-1-5: java.lang.String
-    private final field field-1-6: int
-    private final field field-1-7: int
-    private final @org.jetbrains.annotations.NotNull field field-1-8: java.lang.String
+    private final field a1-f1: int
+    private final field a1-f2: int
+    private final field a1-f3-x: int
+    private final field a1-f3-y: int
+    private final field a1-f4: int
+    private final field a1-f5: int
+    private final @org.jetbrains.annotations.NotNull field a1-f6: java.lang.String
+    private final field a1-f7: int
+    private final field a1-f8: int
+    private final @org.jetbrains.annotations.NotNull field a1-f9: java.lang.String
+    private final field a2-f1: int
+    private final field a2-f2: int
+    private final field a2-f3-x: int
+    private final field a2-f3-y: int
+    private final field a2-f4: int
+    private final field a2-f5: int
+    private final @org.jetbrains.annotations.NotNull field a2-f6: java.lang.String
+    private final field a2-f7: int
+    private final field a2-f8: int
+    private final @org.jetbrains.annotations.NotNull field a2-f9: java.lang.String
     private synthetic method <init>(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String, p10: int, p11: int, p12: int, p13: int, p14: int, p15: int, p16: java.lang.String, p17: int, p18: int, p19: java.lang.String): void
     public synthetic final static method box-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String, p10: int, p11: int, p12: int, p13: int, p14: int, p15: int, p16: java.lang.String, p17: int, p18: int, p19: java.lang.String): B
     public final static method constructor-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, @org.jetbrains.annotations.NotNull p6: java.lang.String, p7: int, p8: int, @org.jetbrains.annotations.NotNull p9: java.lang.String, p10: int, p11: int, p12: int, p13: int, p14: int, p15: int, @org.jetbrains.annotations.NotNull p16: java.lang.String, p17: int, p18: int, @org.jetbrains.annotations.NotNull p19: java.lang.String): void
@@ -80,30 +80,30 @@ public final class B {
     public static method hashCode-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, p6: java.lang.String, p7: int, p8: int, p9: java.lang.String, p10: int, p11: int, p12: int, p13: int, p14: int, p15: int, p16: java.lang.String, p17: int, p18: int, p19: java.lang.String): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static @org.jetbrains.annotations.NotNull method toString-impl(p0: int, p1: int, p2: int, p3: int, p4: int, p5: int, @org.jetbrains.annotations.NotNull p6: java.lang.String, p7: int, p8: int, @org.jetbrains.annotations.NotNull p9: java.lang.String, p10: int, p11: int, p12: int, p13: int, p14: int, p15: int, @org.jetbrains.annotations.NotNull p16: java.lang.String, p17: int, p18: int, @org.jetbrains.annotations.NotNull p19: java.lang.String): java.lang.String
-    public synthetic final method unbox-impl-0(): A
-    public synthetic final method unbox-impl-0-0(): int
-    public synthetic final method unbox-impl-0-1(): int
-    public synthetic final method unbox-impl-0-2(): F3
-    public synthetic final method unbox-impl-0-2-0(): int
-    public synthetic final method unbox-impl-0-2-1(): int
-    public synthetic final method unbox-impl-0-3(): int
-    public synthetic final method unbox-impl-0-4(): int
-    public synthetic final method unbox-impl-0-5(): java.lang.String
-    public synthetic final method unbox-impl-0-6(): int
-    public synthetic final method unbox-impl-0-7(): int
-    public synthetic final method unbox-impl-0-8(): java.lang.String
-    public synthetic final method unbox-impl-1(): A
-    public synthetic final method unbox-impl-1-0(): int
-    public synthetic final method unbox-impl-1-1(): int
-    public synthetic final method unbox-impl-1-2(): F3
-    public synthetic final method unbox-impl-1-2-0(): int
-    public synthetic final method unbox-impl-1-2-1(): int
-    public synthetic final method unbox-impl-1-3(): int
-    public synthetic final method unbox-impl-1-4(): int
-    public synthetic final method unbox-impl-1-5(): java.lang.String
-    public synthetic final method unbox-impl-1-6(): int
-    public synthetic final method unbox-impl-1-7(): int
-    public synthetic final method unbox-impl-1-8(): java.lang.String
+    public synthetic final method unbox-impl-a1(): A
+    public synthetic final method unbox-impl-a1-f1(): int
+    public synthetic final method unbox-impl-a1-f2(): int
+    public synthetic final method unbox-impl-a1-f3(): F3
+    public synthetic final method unbox-impl-a1-f3-x(): int
+    public synthetic final method unbox-impl-a1-f3-y(): int
+    public synthetic final method unbox-impl-a1-f4(): int
+    public synthetic final method unbox-impl-a1-f5(): int
+    public synthetic final method unbox-impl-a1-f6(): java.lang.String
+    public synthetic final method unbox-impl-a1-f7(): int
+    public synthetic final method unbox-impl-a1-f8(): int
+    public synthetic final method unbox-impl-a1-f9(): java.lang.String
+    public synthetic final method unbox-impl-a2(): A
+    public synthetic final method unbox-impl-a2-f1(): int
+    public synthetic final method unbox-impl-a2-f2(): int
+    public synthetic final method unbox-impl-a2-f3(): F3
+    public synthetic final method unbox-impl-a2-f3-x(): int
+    public synthetic final method unbox-impl-a2-f3-y(): int
+    public synthetic final method unbox-impl-a2-f4(): int
+    public synthetic final method unbox-impl-a2-f5(): int
+    public synthetic final method unbox-impl-a2-f6(): java.lang.String
+    public synthetic final method unbox-impl-a2-f7(): int
+    public synthetic final method unbox-impl-a2-f8(): int
+    public synthetic final method unbox-impl-a2-f9(): java.lang.String
 }
 
 @kotlin.Metadata
@@ -154,8 +154,8 @@ public final class F2 {
 @kotlin.Metadata
 public final class F3 {
     // source: 'equality.kt'
-    private final field field-0: int
-    private final field field-1: int
+    private final field x: int
+    private final field y: int
     private synthetic method <init>(p0: int, p1: int): void
     public synthetic final static method box-impl(p0: int, p1: int): F3
     public final static method constructor-impl(p0: int, p1: int): void
@@ -168,8 +168,8 @@ public final class F3 {
     public static method hashCode-impl(p0: int, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int): java.lang.String
-    public synthetic final method unbox-impl-0(): int
-    public synthetic final method unbox-impl-1(): int
+    public synthetic final method unbox-impl-x(): int
+    public synthetic final method unbox-impl-y(): int
 }
 
 @kotlin.jvm.JvmInline

compiler/testData/codegen/box/valueClasses/functionReferences.fir.txt

@@ -1,21 +1,21 @@
 @kotlin.Metadata
 public final class A {
     // source: 'functionReferences.kt'
-    private final field point-0: double
-    private final field point-1: double
+    private final field point-x: double
+    private final field point-y: double
     public method <init>(p0: double, p1: double): void
     public final method f-GPBa7dw(p0: double, p1: double, p2: double): double
     public final @org.jetbrains.annotations.NotNull method getPoint(): DPoint
-    public synthetic final method getPoint-0(): double
-    public synthetic final method getPoint-1(): double
+    public synthetic final method getPoint-x(): double
+    public synthetic final method getPoint-y(): double
 }
 
 @kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class DPoint {
     // source: 'functionReferences.kt'
-    private final field field-0: double
-    private final field field-1: double
+    private final field x: double
+    private final field y: double
     private synthetic method <init>(p0: double, p1: double): void
     public synthetic final static method box-impl(p0: double, p1: double): DPoint
     public final static method constructor-impl(p0: double, p1: double): void
@@ -29,8 +29,8 @@ public final class DPoint {
     public static method hashCode-impl(p0: double, p1: double): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: double, p1: double): java.lang.String
-    public synthetic final method unbox-impl-0(): double
-    public synthetic final method unbox-impl-1(): double
+    public synthetic final method unbox-impl-x(): double
+    public synthetic final method unbox-impl-y(): double
 }
 
 @kotlin.Metadata

compiler/testData/codegen/box/valueClasses/functionReferences.txt

@@ -1,21 +1,21 @@
 @kotlin.Metadata
 public final class A {
     // source: 'functionReferences.kt'
-    private final field point-0: double
-    private final field point-1: double
+    private final field point-x: double
+    private final field point-y: double
     public method <init>(p0: double, p1: double): void
     public final method f-GPBa7dw(p0: double, p1: double, p2: double): double
     public final @org.jetbrains.annotations.NotNull method getPoint(): DPoint
-    public synthetic final method getPoint-0(): double
-    public synthetic final method getPoint-1(): double
+    public synthetic final method getPoint-x(): double
+    public synthetic final method getPoint-y(): double
 }
 
 @kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class DPoint {
     // source: 'functionReferences.kt'
-    private final field field-0: double
-    private final field field-1: double
+    private final field x: double
+    private final field y: double
     private synthetic method <init>(p0: double, p1: double): void
     public synthetic final static method box-impl(p0: double, p1: double): DPoint
     public final static method constructor-impl(p0: double, p1: double): void
@@ -29,8 +29,8 @@ public final class DPoint {
     public static method hashCode-impl(p0: double, p1: double): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: double, p1: double): java.lang.String
-    public synthetic final method unbox-impl-0(): double
-    public synthetic final method unbox-impl-1(): double
+    public synthetic final method unbox-impl-x(): double
+    public synthetic final method unbox-impl-y(): double
 }
 
 @kotlin.Metadata

compiler/testData/codegen/box/valueClasses/mfvcBothEqualsOverride.fir.txt

@@ -2,8 +2,8 @@
 @kotlin.Metadata
 public final class MFVC {
     // source: 'mfvcBothEqualsOverride.kt'
-    private final field field-0: int
-    private final field field-1: int
+    private final field x: int
+    private final field y: int
     private synthetic method <init>(p0: int, p1: int): void
     public synthetic final static method box-impl(p0: int, p1: int): MFVC
     public final static method constructor-impl(p0: int, p1: int): void
@@ -16,8 +16,8 @@ public final class MFVC {
     public final static method hashCode-impl(p0: int, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int): java.lang.String
-    public synthetic final method unbox-impl-0(): int
-    public synthetic final method unbox-impl-1(): int
+    public synthetic final method unbox-impl-x(): int
+    public synthetic final method unbox-impl-y(): int
 }
 
 @kotlin.Metadata

compiler/testData/codegen/box/valueClasses/mfvcBothEqualsOverride.txt

@@ -2,8 +2,8 @@
 @kotlin.Metadata
 public final class MFVC {
     // source: 'mfvcBothEqualsOverride.kt'
-    private final field field-0: int
-    private final field field-1: int
+    private final field x: int
+    private final field y: int
     private synthetic method <init>(p0: int, p1: int): void
     public synthetic final static method box-impl(p0: int, p1: int): MFVC
     public final static method constructor-impl(p0: int, p1: int): void
@@ -16,8 +16,8 @@ public final class MFVC {
     public static method hashCode-impl(p0: int, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int): java.lang.String
-    public synthetic final method unbox-impl-0(): int
-    public synthetic final method unbox-impl-1(): int
+    public synthetic final method unbox-impl-x(): int
+    public synthetic final method unbox-impl-y(): int
 }
 
 @kotlin.Metadata

compiler/testData/codegen/box/valueClasses/mfvcEqualsConsistency.fir.txt

@@ -2,8 +2,8 @@
 @kotlin.Metadata
 public final class MFVC1 {
     // source: 'mfvcEqualsConsistency.kt'
-    private final field field-0: int
-    private final field field-1: int
+    private final field x: int
+    private final field y: int
     private synthetic method <init>(p0: int, p1: int): void
     public synthetic final static method box-impl(p0: int, p1: int): MFVC1
     public final static method constructor-impl(p0: int, p1: int): void
@@ -16,16 +16,16 @@ public final class MFVC1 {
     public static method hashCode-impl(p0: int, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int): java.lang.String
-    public synthetic final method unbox-impl-0(): int
-    public synthetic final method unbox-impl-1(): int
+    public synthetic final method unbox-impl-x(): int
+    public synthetic final method unbox-impl-y(): int
 }
 
 @kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class MFVC2 {
     // source: 'mfvcEqualsConsistency.kt'
-    private final field field-0: int
-    private final field field-1: int
+    private final field x: int
+    private final field y: int
     private synthetic method <init>(p0: int, p1: int): void
     public synthetic final static method box-impl(p0: int, p1: int): MFVC2
     public final static method constructor-impl(p0: int, p1: int): void
@@ -38,8 +38,8 @@ public final class MFVC2 {
     public static method hashCode-impl(p0: int, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int): java.lang.String
-    public synthetic final method unbox-impl-0(): int
-    public synthetic final method unbox-impl-1(): int
+    public synthetic final method unbox-impl-x(): int
+    public synthetic final method unbox-impl-y(): int
 }
 
 @kotlin.Metadata

compiler/testData/codegen/box/valueClasses/mfvcEqualsConsistency.txt

@@ -2,8 +2,8 @@
 @kotlin.Metadata
 public final class MFVC1 {
     // source: 'mfvcEqualsConsistency.kt'
-    private final field field-0: int
-    private final field field-1: int
+    private final field x: int
+    private final field y: int
     private synthetic method <init>(p0: int, p1: int): void
     public synthetic final static method box-impl(p0: int, p1: int): MFVC1
     public final static method constructor-impl(p0: int, p1: int): void
@@ -16,16 +16,16 @@ public final class MFVC1 {
     public static method hashCode-impl(p0: int, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int): java.lang.String
-    public synthetic final method unbox-impl-0(): int
-    public synthetic final method unbox-impl-1(): int
+    public synthetic final method unbox-impl-x(): int
+    public synthetic final method unbox-impl-y(): int
 }
 
 @kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class MFVC2 {
     // source: 'mfvcEqualsConsistency.kt'
-    private final field field-0: int
-    private final field field-1: int
+    private final field x: int
+    private final field y: int
     private synthetic method <init>(p0: int, p1: int): void
     public synthetic final static method box-impl(p0: int, p1: int): MFVC2
     public final static method constructor-impl(p0: int, p1: int): void
@@ -38,8 +38,8 @@ public final class MFVC2 {
     public static method hashCode-impl(p0: int, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int): java.lang.String
-    public synthetic final method unbox-impl-0(): int
-    public synthetic final method unbox-impl-1(): int
+    public synthetic final method unbox-impl-x(): int
+    public synthetic final method unbox-impl-y(): int
 }
 
 @kotlin.Metadata

compiler/testData/codegen/box/valueClasses/mfvcEqualsOverriddenForCollections.fir.txt

@@ -2,8 +2,8 @@
 @kotlin.Metadata
 public final class MFVC {
     // source: 'mfvcEqualsOverriddenForCollections.kt'
-    private final field field-0: double
-    private final field field-1: int
+    private final field x: double
+    private final field y: int
     private synthetic method <init>(p0: double, p1: int): void
     public synthetic final static method box-impl(p0: double, p1: int): MFVC
     public final static method constructor-impl(p0: double, p1: int): void
@@ -16,8 +16,8 @@ public final class MFVC {
     public final static method hashCode-impl(p0: double, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: double, p1: int): java.lang.String
-    public synthetic final method unbox-impl-0(): double
-    public synthetic final method unbox-impl-1(): int
+    public synthetic final method unbox-impl-x(): double
+    public synthetic final method unbox-impl-y(): int
 }
 
 @kotlin.Metadata

compiler/testData/codegen/box/valueClasses/mfvcEqualsOverriddenForCollections.txt

@@ -2,8 +2,8 @@
 @kotlin.Metadata
 public final class MFVC {
     // source: 'mfvcEqualsOverriddenForCollections.kt'
-    private final field field-0: double
-    private final field field-1: int
+    private final field x: double
+    private final field y: int
     private synthetic method <init>(p0: double, p1: int): void
     public synthetic final static method box-impl(p0: double, p1: int): MFVC
     public final static method constructor-impl(p0: double, p1: int): void
@@ -16,8 +16,8 @@ public final class MFVC {
     public static method hashCode-impl(p0: double, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: double, p1: int): java.lang.String
-    public synthetic final method unbox-impl-0(): double
-    public synthetic final method unbox-impl-1(): int
+    public synthetic final method unbox-impl-x(): double
+    public synthetic final method unbox-impl-y(): int
 }
 
 @kotlin.Metadata

compiler/testData/codegen/box/valueClasses/mfvcEqualsOverride.fir.txt

@@ -8,8 +8,8 @@ public interface I {
 @kotlin.Metadata
 public final class MFVC {
     // source: 'mfvcEqualsOverride.kt'
-    private final field field-0: int
-    private final field field-1: int
+    private final field value: int
+    private final field y: int
     private synthetic method <init>(p0: int, p1: int): void
     public synthetic final static method box-impl(p0: int, p1: int): MFVC
     public final static method constructor-impl(p0: int, p1: int): void
@@ -23,8 +23,8 @@ public final class MFVC {
     public static method hashCode-impl(p0: int, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int): java.lang.String
-    public synthetic final method unbox-impl-0(): int
-    public synthetic final method unbox-impl-1(): int
+    public synthetic final method unbox-impl-value(): int
+    public synthetic final method unbox-impl-y(): int
 }
 
 @kotlin.Metadata

compiler/testData/codegen/box/valueClasses/mfvcEqualsOverride.txt

@@ -8,8 +8,8 @@ public interface I {
 @kotlin.Metadata
 public final class MFVC {
     // source: 'mfvcEqualsOverride.kt'
-    private final field field-0: int
-    private final field field-1: int
+    private final field value: int
+    private final field y: int
     private synthetic method <init>(p0: int, p1: int): void
     public synthetic final static method box-impl(p0: int, p1: int): MFVC
     public final static method constructor-impl(p0: int, p1: int): void
@@ -23,8 +23,8 @@ public final class MFVC {
     public static method hashCode-impl(p0: int, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int): java.lang.String
-    public synthetic final method unbox-impl-0(): int
-    public synthetic final method unbox-impl-1(): int
+    public synthetic final method unbox-impl-value(): int
+    public synthetic final method unbox-impl-y(): int
 }
 
 @kotlin.Metadata

compiler/testData/codegen/box/valueClasses/mfvcFieldInitializationOrder.txt

@@ -1,34 +1,34 @@
 @kotlin.Metadata
 public final class A {
     // source: 'mfvcFieldInitializationOrder.kt'
-    private field x-0: double
-    private field x-1: double
+    private field x-x: double
+    private field x-y: double
     public method <init>(p0: double, p1: double): void
     public final @org.jetbrains.annotations.NotNull method getX(): DPoint
-    public synthetic final method getX-0(): double
-    public synthetic final method getX-1(): double
+    public synthetic final method getX-x(): double
+    public synthetic final method getX-y(): double
     public final method setX-sUp7gFk(p0: double, p1: double): void
 }
 
 @kotlin.Metadata
 public final class B {
     // source: 'mfvcFieldInitializationOrder.kt'
-    private field a-0: double
-    private field a-1: double
-    private final field b-0: double
-    private final field b-1: double
-    private final field c-0: double
-    private final field c-1: double
+    private field a-x: double
+    private field a-y: double
+    private final field b-x: double
+    private final field b-y: double
+    private final field c-x: double
+    private final field c-y: double
     public method <init>(): void
     public final @org.jetbrains.annotations.NotNull method getA(): DPoint
-    public synthetic final method getA-0(): double
-    public synthetic final method getA-1(): double
+    public synthetic final method getA-x(): double
+    public synthetic final method getA-y(): double
     public final @org.jetbrains.annotations.NotNull method getB(): DPoint
-    public synthetic final method getB-0(): double
-    public synthetic final method getB-1(): double
+    public synthetic final method getB-x(): double
+    public synthetic final method getB-y(): double
     public final @org.jetbrains.annotations.NotNull method getC(): DPoint
-    public synthetic final method getC-0(): double
-    public synthetic final method getC-1(): double
+    public synthetic final method getC-x(): double
+    public synthetic final method getC-y(): double
     public final method setA-sUp7gFk(p0: double, p1: double): void
 }
 
@@ -36,8 +36,8 @@ public final class B {
 @kotlin.Metadata
 public final class DPoint {
     // source: 'mfvcFieldInitializationOrder.kt'
-    private final field field-0: double
-    private final field field-1: double
+    private final field x: double
+    private final field y: double
     private synthetic method <init>(p0: double, p1: double): void
     public synthetic final static method box-impl(p0: double, p1: double): DPoint
     public final static method constructor-impl(p0: double, p1: double): void
@@ -50,8 +50,8 @@ public final class DPoint {
     public static method hashCode-impl(p0: double, p1: double): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: double, p1: double): java.lang.String
-    public synthetic final method unbox-impl-0(): double
-    public synthetic final method unbox-impl-1(): double
+    public synthetic final method unbox-impl-x(): double
+    public synthetic final method unbox-impl-y(): double
 }
 
 @kotlin.Metadata

compiler/testData/codegen/box/valueClasses/mfvcHashCodeOverride.fir.txt

@@ -2,8 +2,8 @@
 @kotlin.Metadata
 public final class A {
     // source: 'mfvcHashCodeOverride.kt'
-    private final @org.jetbrains.annotations.NotNull field field-0: MyClass
-    private final @org.jetbrains.annotations.NotNull field field-1: MyClass
+    private final @org.jetbrains.annotations.NotNull field value1: MyClass
+    private final @org.jetbrains.annotations.NotNull field value2: MyClass
     private synthetic method <init>(p0: MyClass, p1: MyClass): void
     public synthetic final static method box-impl(p0: MyClass, p1: MyClass): A
     public final static method constructor-impl(@org.jetbrains.annotations.NotNull p0: MyClass, @org.jetbrains.annotations.NotNull p1: MyClass): void
@@ -16,8 +16,8 @@ public final class A {
     public final static method hashCode-impl(@org.jetbrains.annotations.NotNull p0: MyClass, @org.jetbrains.annotations.NotNull p1: MyClass): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: MyClass, p1: MyClass): java.lang.String
-    public synthetic final method unbox-impl-0(): MyClass
-    public synthetic final method unbox-impl-1(): MyClass
+    public synthetic final method unbox-impl-value1(): MyClass
+    public synthetic final method unbox-impl-value2(): MyClass
 }
 
 @kotlin.Metadata

compiler/testData/codegen/box/valueClasses/mfvcHashCodeOverride.txt

@@ -2,8 +2,8 @@
 @kotlin.Metadata
 public final class A {
     // source: 'mfvcHashCodeOverride.kt'
-    private final @org.jetbrains.annotations.NotNull field field-0: MyClass
-    private final @org.jetbrains.annotations.NotNull field field-1: MyClass
+    private final @org.jetbrains.annotations.NotNull field value1: MyClass
+    private final @org.jetbrains.annotations.NotNull field value2: MyClass
     private synthetic method <init>(p0: MyClass, p1: MyClass): void
     public synthetic final static method box-impl(p0: MyClass, p1: MyClass): A
     public final static method constructor-impl(@org.jetbrains.annotations.NotNull p0: MyClass, @org.jetbrains.annotations.NotNull p1: MyClass): void
@@ -16,8 +16,8 @@ public final class A {
     public static method hashCode-impl(@org.jetbrains.annotations.NotNull p0: MyClass, @org.jetbrains.annotations.NotNull p1: MyClass): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: MyClass, p1: MyClass): java.lang.String
-    public synthetic final method unbox-impl-0(): MyClass
-    public synthetic final method unbox-impl-1(): MyClass
+    public synthetic final method unbox-impl-value1(): MyClass
+    public synthetic final method unbox-impl-value2(): MyClass
 }
 
 @kotlin.Metadata

compiler/testData/codegen/box/valueClasses/mfvcTypedEqualsGenerics.fir.txt

@@ -12,8 +12,8 @@ public final class Generic {
 @kotlin.Metadata
 public final class MFVC1 {
     // source: 'mfvcTypedEqualsGenerics.kt'
-    private final @org.jetbrains.annotations.NotNull field field-0: java.lang.Number
-    private final field field-1: int
+    private final field other: int
+    private final @org.jetbrains.annotations.NotNull field x: java.lang.Number
     private synthetic method <init>(p0: java.lang.Number, p1: int): void
     public synthetic final static method box-impl(p0: java.lang.Number, p1: int): MFVC1
     public final static method constructor-impl(@org.jetbrains.annotations.NotNull p0: java.lang.Number, p1: int): void
@@ -27,16 +27,16 @@ public final class MFVC1 {
     public static method hashCode-impl(p0: java.lang.Number, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: java.lang.Number, p1: int): java.lang.String
-    public synthetic final method unbox-impl-0(): java.lang.Number
-    public synthetic final method unbox-impl-1(): int
+    public synthetic final method unbox-impl-other(): int
+    public synthetic final method unbox-impl-x(): java.lang.Number
 }
 
 @kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class MFVC2 {
     // source: 'mfvcTypedEqualsGenerics.kt'
-    private final @org.jetbrains.annotations.NotNull field field-0: Generic
-    private final field field-1: int
+    private final field other: int
+    private final @org.jetbrains.annotations.NotNull field value: Generic
     private synthetic method <init>(p0: Generic, p1: int): void
     public synthetic final static method box-impl(p0: Generic, p1: int): MFVC2
     public final static method constructor-impl(@org.jetbrains.annotations.NotNull p0: Generic, p1: int): void
@@ -50,16 +50,16 @@ public final class MFVC2 {
     public static method hashCode-impl(p0: Generic, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: Generic, p1: int): java.lang.String
-    public synthetic final method unbox-impl-0(): Generic
-    public synthetic final method unbox-impl-1(): int
+    public synthetic final method unbox-impl-other(): int
+    public synthetic final method unbox-impl-value(): Generic
 }
 
 @kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class MFVC3 {
     // source: 'mfvcTypedEqualsGenerics.kt'
-    private final field field-0: java.lang.Object
-    private final field field-1: int
+    private final field other: int
+    private final field value: java.lang.Object
     private synthetic method <init>(p0: java.lang.Object, p1: int): void
     public synthetic final static method box-impl(p0: java.lang.Object, p1: int): MFVC3
     public final static method constructor-impl(p0: java.lang.Object, p1: int): void
@@ -73,16 +73,16 @@ public final class MFVC3 {
     public static method hashCode-impl(p0: java.lang.Object, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: java.lang.Object, p1: int): java.lang.String
-    public synthetic final method unbox-impl-0(): java.lang.Object
-    public synthetic final method unbox-impl-1(): int
+    public synthetic final method unbox-impl-other(): int
+    public synthetic final method unbox-impl-value(): java.lang.Object
 }
 
 @kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class MFVC4 {
     // source: 'mfvcTypedEqualsGenerics.kt'
-    private final field field-0: java.lang.Object
-    private final field field-1: int
+    private final field other: int
+    private final field value: java.lang.Object
     private synthetic method <init>(p0: java.lang.Object, p1: int): void
     public synthetic final static method box-impl(p0: java.lang.Object, p1: int): MFVC4
     public final static method constructor-impl(p0: java.lang.Object, p1: int): void
@@ -96,8 +96,8 @@ public final class MFVC4 {
     public static method hashCode-impl(p0: java.lang.Object, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: java.lang.Object, p1: int): java.lang.String
-    public synthetic final method unbox-impl-0(): java.lang.Object
-    public synthetic final method unbox-impl-1(): int
+    public synthetic final method unbox-impl-other(): int
+    public synthetic final method unbox-impl-value(): java.lang.Object
 }
 
 @kotlin.Metadata

compiler/testData/codegen/box/valueClasses/mfvcTypedEqualsGenerics.txt

@@ -12,8 +12,8 @@ public final class Generic {
 @kotlin.Metadata
 public final class MFVC1 {
     // source: 'mfvcTypedEqualsGenerics.kt'
-    private final @org.jetbrains.annotations.NotNull field field-0: java.lang.Number
-    private final field field-1: int
+    private final field other: int
+    private final @org.jetbrains.annotations.NotNull field x: java.lang.Number
     private synthetic method <init>(p0: java.lang.Number, p1: int): void
     public synthetic final static method box-impl(p0: java.lang.Number, p1: int): MFVC1
     public final static method constructor-impl(@org.jetbrains.annotations.NotNull p0: java.lang.Number, p1: int): void
@@ -27,16 +27,16 @@ public final class MFVC1 {
     public static method hashCode-impl(p0: java.lang.Number, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: java.lang.Number, p1: int): java.lang.String
-    public synthetic final method unbox-impl-0(): java.lang.Number
-    public synthetic final method unbox-impl-1(): int
+    public synthetic final method unbox-impl-other(): int
+    public synthetic final method unbox-impl-x(): java.lang.Number
 }
 
 @kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class MFVC2 {
     // source: 'mfvcTypedEqualsGenerics.kt'
-    private final @org.jetbrains.annotations.NotNull field field-0: Generic
-    private final field field-1: int
+    private final field other: int
+    private final @org.jetbrains.annotations.NotNull field value: Generic
     private synthetic method <init>(p0: Generic, p1: int): void
     public synthetic final static method box-impl(p0: Generic, p1: int): MFVC2
     public final static method constructor-impl(@org.jetbrains.annotations.NotNull p0: Generic, p1: int): void
@@ -50,16 +50,16 @@ public final class MFVC2 {
     public static method hashCode-impl(p0: Generic, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: Generic, p1: int): java.lang.String
-    public synthetic final method unbox-impl-0(): Generic
-    public synthetic final method unbox-impl-1(): int
+    public synthetic final method unbox-impl-other(): int
+    public synthetic final method unbox-impl-value(): Generic
 }
 
 @kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class MFVC3 {
     // source: 'mfvcTypedEqualsGenerics.kt'
-    private final field field-0: java.lang.Object
-    private final field field-1: int
+    private final field other: int
+    private final field value: java.lang.Object
     private synthetic method <init>(p0: java.lang.Object, p1: int): void
     public synthetic final static method box-impl(p0: java.lang.Object, p1: int): MFVC3
     public final static method constructor-impl(p0: java.lang.Object, p1: int): void
@@ -73,16 +73,16 @@ public final class MFVC3 {
     public static method hashCode-impl(p0: java.lang.Object, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: java.lang.Object, p1: int): java.lang.String
-    public synthetic final method unbox-impl-0(): java.lang.Object
-    public synthetic final method unbox-impl-1(): int
+    public synthetic final method unbox-impl-other(): int
+    public synthetic final method unbox-impl-value(): java.lang.Object
 }
 
 @kotlin.jvm.JvmInline
 @kotlin.Metadata
 public final class MFVC4 {
     // source: 'mfvcTypedEqualsGenerics.kt'
-    private final field field-0: java.lang.Object
-    private final field field-1: int
+    private final field other: int
+    private final field value: java.lang.Object
     private synthetic method <init>(p0: java.lang.Object, p1: int): void
     public synthetic final static method box-impl(p0: java.lang.Object, p1: int): MFVC4
     public final static method constructor-impl(p0: java.lang.Object, p1: int): void
@@ -96,8 +96,8 @@ public final class MFVC4 {
     public static method hashCode-impl(p0: java.lang.Object, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: java.lang.Object, p1: int): java.lang.String
-    public synthetic final method unbox-impl-0(): java.lang.Object
-    public synthetic final method unbox-impl-1(): int
+    public synthetic final method unbox-impl-other(): int
+    public synthetic final method unbox-impl-value(): java.lang.Object
 }
 
 @kotlin.Metadata

compiler/testData/codegen/box/valueClasses/mfvcUntypedEqualsOverriden.fir.txt

@@ -2,8 +2,8 @@
 @kotlin.Metadata
 public final class MFVC {
     // source: 'mfvcUntypedEqualsOverriden.kt'
-    private final field field-0: int
-    private final field field-1: int
+    private final field x: int
+    private final field y: int
     private synthetic method <init>(p0: int, p1: int): void
     public synthetic final static method box-impl(p0: int, p1: int): MFVC
     public final static method constructor-impl(p0: int, p1: int): void
@@ -16,8 +16,8 @@ public final class MFVC {
     public final static method hashCode-impl(p0: int, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int): java.lang.String
-    public synthetic final method unbox-impl-0(): int
-    public synthetic final method unbox-impl-1(): int
+    public synthetic final method unbox-impl-x(): int
+    public synthetic final method unbox-impl-y(): int
 }
 
 @kotlin.Metadata

compiler/testData/codegen/box/valueClasses/mfvcUntypedEqualsOverriden.txt

@@ -2,8 +2,8 @@
 @kotlin.Metadata
 public final class MFVC {
     // source: 'mfvcUntypedEqualsOverriden.kt'
-    private final field field-0: int
-    private final field field-1: int
+    private final field x: int
+    private final field y: int
     private synthetic method <init>(p0: int, p1: int): void
     public synthetic final static method box-impl(p0: int, p1: int): MFVC
     public final static method constructor-impl(p0: int, p1: int): void
@@ -16,8 +16,8 @@ public final class MFVC {
     public static method hashCode-impl(p0: int, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int): java.lang.String
-    public synthetic final method unbox-impl-0(): int
-    public synthetic final method unbox-impl-1(): int
+    public synthetic final method unbox-impl-x(): int
+    public synthetic final method unbox-impl-y(): int
 }
 
 @kotlin.Metadata

compiler/testData/codegen/box/valueClasses/throwingMFVCReassignments.txt

@@ -2,8 +2,8 @@
 @kotlin.Metadata
 public final class DPoint {
     // source: 'throwingMFVCReassignments.kt'
-    private final field field-0: double
-    private final field field-1: double
+    private final field x: double
+    private final field y: double
     private synthetic method <init>(p0: double, p1: double): void
     public synthetic final static method box-impl(p0: double, p1: double): DPoint
     public final static method constructor-impl(p0: double, p1: double): void
@@ -16,19 +16,19 @@ public final class DPoint {
     public static method hashCode-impl(p0: double, p1: double): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: double, p1: double): java.lang.String
-    public synthetic final method unbox-impl-0(): double
-    public synthetic final method unbox-impl-1(): double
+    public synthetic final method unbox-impl-x(): double
+    public synthetic final method unbox-impl-y(): double
 }
 
 @kotlin.Metadata
 public final class PointBox {
     // source: 'throwingMFVCReassignments.kt'
-    private field value-0: double
-    private field value-1: double
+    private field value-x: double
+    private field value-y: double
     public method <init>(p0: double, p1: double): void
     public final @org.jetbrains.annotations.NotNull method getValue(): DPoint
-    public synthetic final method getValue-0(): double
-    public synthetic final method getValue-1(): double
+    public synthetic final method getValue-x(): double
+    public synthetic final method getValue-y(): double
     public final method setValue-sUp7gFk(p0: double, p1: double): void
 }
 

compiler/testData/codegen/box/valueClasses/tryExpressions.txt

@@ -2,8 +2,8 @@
 @kotlin.Metadata
 public final class DPoint {
     // source: 'tryExpressions.kt'
-    private final field field-0: double
-    private final field field-1: double
+    private final field x: double
+    private final field y: double
     private synthetic method <init>(p0: double, p1: double): void
     public synthetic final static method box-impl(p0: double, p1: double): DPoint
     public final static method constructor-impl(p0: double, p1: double): void
@@ -16,8 +16,8 @@ public final class DPoint {
     public static method hashCode-impl(p0: double, p1: double): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: double, p1: double): java.lang.String
-    public synthetic final method unbox-impl-0(): double
-    public synthetic final method unbox-impl-1(): double
+    public synthetic final method unbox-impl-x(): double
+    public synthetic final method unbox-impl-y(): double
 }
 
 @kotlin.Metadata

compiler/testData/codegen/bytecodeListing/valueClasses/annotations.txt

@@ -3,8 +3,8 @@
 @kotlin.Metadata
 public final class A {
     // source: 'annotations.kt'
-    private final @Ann$Container(value=[Ann, Ann]) field field-0: int
-    private final @Ann$Container(value=[Ann, Ann]) field field-1: int
+    private final @Ann$Container(value=[Ann, Ann]) field x: int
+    private final @Ann$Container(value=[Ann, Ann]) field y: int
     private synthetic method <init>(p0: int, p1: int): void
     public synthetic final static method box-impl(p0: int, p1: int): A
     public final static @Ann method constructor-impl(@Ann$Container(value=[Ann, Ann, Ann, Ann]) p0: int, @Ann$Container(value=[Ann, Ann, Ann, Ann]) p1: int): void
@@ -20,8 +20,8 @@ public final class A {
     public static method hashCode-impl(p0: int, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int): java.lang.String
-    public synthetic final method unbox-impl-0(): int
-    public synthetic final method unbox-impl-1(): int
+    public synthetic final method unbox-impl-x(): int
+    public synthetic final method unbox-impl-y(): int
     public inner class Ann$Container
 }
 
@@ -63,9 +63,9 @@ public final class AnnotationsKt {
 @kotlin.Metadata
 public final class B {
     // source: 'annotations.kt'
-    private final field field-0-0: int
-    private final field field-0-1: int
-    private final @Ann$Container(value=[Ann, Ann]) @org.jetbrains.annotations.Nullable field field-1: A
+    private final field x-x: int
+    private final field x-y: int
+    private final @Ann$Container(value=[Ann, Ann]) @org.jetbrains.annotations.Nullable field y: A
     private synthetic method <init>(p0: int, p1: int, p2: A): void
     public synthetic final static method box-impl(p0: int, p1: int, p2: A): B
     public final static @Ann method constructor-impl(p0: int, p1: int, @Ann$Container(value=[Ann, Ann, Ann, Ann]) @org.jetbrains.annotations.Nullable p2: A): void
@@ -80,10 +80,10 @@ public final class B {
     public static method hashCode-impl(p0: int, p1: int, p2: A): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
     public static method toString-impl(p0: int, p1: int, p2: A): java.lang.String
-    public synthetic final method unbox-impl-0(): A
-    public synthetic final method unbox-impl-0-0(): int
-    public synthetic final method unbox-impl-0-1(): int
-    public synthetic final method unbox-impl-1(): A
+    public synthetic final method unbox-impl-x(): A
+    public synthetic final method unbox-impl-x-x(): int
+    public synthetic final method unbox-impl-x-y(): int
+    public synthetic final method unbox-impl-y(): A
     public inner class Ann$Container
 }
 
@@ -104,10 +104,10 @@ final class C$z$2 {
 public final class C {
     // source: 'annotations.kt'
     synthetic final static field $$delegatedProperties: kotlin.reflect.KProperty[]
-    private final field t$delegate-0: int
-    private final field t$delegate-1: int
-    private field x-0: int
-    private field x-1: int
+    private final field t$delegate-x: int
+    private final field t$delegate-y: int
+    private field x-x: int
+    private field x-y: int
     private @Ann$Container(value=[Ann, Ann]) @org.jetbrains.annotations.Nullable field y: A
     private final @Ann$Container(value=[Ann, Ann]) @org.jetbrains.annotations.NotNull field z$delegate: kotlin.Lazy
     inner (anonymous) class C$z$2
@@ -118,20 +118,20 @@ public final class C {
     public synthetic deprecated static @Ann$Container(value=[Ann, Ann]) method getD$annotations(): void
     private static method getD$delegate(p0: C): java.lang.Object
     public final @org.jetbrains.annotations.NotNull method getD(): A
-    public synthetic final method getD-0(): int
-    public synthetic final method getD-1(): int
+    public synthetic final method getD-x(): int
+    public synthetic final method getD-y(): int
     public synthetic deprecated static @Ann$Container(value=[Ann, Ann]) method getT$annotations(): void
     public final @Ann$Container(value=[Ann, Ann]) method getT(): int
     public synthetic deprecated static @Ann$Container(value=[Ann, Ann]) method getX$annotations(): void
     public final @org.jetbrains.annotations.NotNull method getX(): A
-    public synthetic final method getX-0(): int
-    public synthetic final method getX-1(): int
+    public synthetic final method getX-x(): int
+    public synthetic final method getX-y(): int
     public synthetic deprecated static @Ann$Container(value=[Ann, Ann]) method getY$annotations(): void
     public final @Ann$Container(value=[Ann, Ann]) @org.jetbrains.annotations.Nullable method getY(): A
     public synthetic deprecated static @Ann$Container(value=[Ann, Ann]) method getZ$annotations(): void
     public final @org.jetbrains.annotations.NotNull method getZ(): A
-    public synthetic final method getZ-0(): int
-    public synthetic final method getZ-1(): int
+    public synthetic final method getZ-x(): int
+    public synthetic final method getZ-y(): int
     public final @Ann$Container(value=[Ann, Ann]) method setX-sUp7gFk(p0: int, p1: int): void
     public final @Ann$Container(value=[Ann, Ann]) method setY(@Ann$Container(value=[Ann, Ann]) @org.jetbrains.annotations.Nullable p0: A): void
     public inner class Ann$Container

compiler/testData/codegen/bytecodeText/valueClasses/equalsBoxTest.kt

@@ -62,7 +62,7 @@ fun equalsChecks12(left: DPoint, right: DPoint) {
 // 1 BIPUSH 105\n {4}DLOAD 0\n {4}DLOAD 2\n {4}ACONST_NULL\n {4}INVOKESTATIC .*equals-impl .*\n {4}INVOKESTATIC .*require
 // 1 BIPUSH 106\n {4}ACONST_NULL\n {4}DLOAD 4\n {4}DLOAD 6\n {4}.*box.*\n {4}INVOKESTATIC .*Intrinsics.areEqual.*\n {4}INVOKESTATIC .*require
 // 1 BIPUSH 107\n {4}DLOAD 0\n {4}DLOAD 2\n {4}ACONST_NULL\n {4}INVOKESTATIC .*equals-impl .*\n {4}INVOKESTATIC .*require
-// 1 BIPUSH 108\n {4}ACONST_NULL\n {4}.*toDPointOrNull.*\n {4}ASTORE.*\n {4}ALOAD.*\n {4}DUP\n {4}IFNONNULL.*(\n {3}([^b\n]|b[^o\n]|bo[^x\n]|box-impl-\d)+)*\n {4}INVOKESTATIC .*require
+// 1 BIPUSH 108\n {4}ACONST_NULL\n {4}.*toDPointOrNull.*\n {4}ASTORE.*\n {4}ALOAD.*\n {4}DUP\n {4}IFNONNULL.*(\n {3}([^b\n]|b[^o\n]|bo[^x\n]|box-impl-\w+)+)*\n {4}INVOKESTATIC .*require
 // 1 BIPUSH 109\n {4}DLOAD 0\n {4}DLOAD 2\n {4}ACONST_NULL\n {4}.*toDPointOrNull.*\n {4}INVOKESTATIC .*equals-impl .*\n {4}INVOKESTATIC .*require
-// 1 BIPUSH 110\n {4}DLOAD 0\n {4}DLOAD 2\n {4}.*toDPointOrNull.*\n {4}ASTORE.*\n {4}ALOAD.*\n {4}DUP\n {4}IFNONNULL.*(\n {3}([^b\n]|b[^o\n]|bo[^x\n]|box-impl-\d)+)*\n {4}INVOKESTATIC .*require
+// 1 BIPUSH 110\n {4}DLOAD 0\n {4}DLOAD 2\n {4}.*toDPointOrNull.*\n {4}ASTORE.*\n {4}ALOAD.*\n {4}DUP\n {4}IFNONNULL.*(\n {3}([^b\n]|b[^o\n]|bo[^x\n]|box-impl-\w+)+)*\n {4}INVOKESTATIC .*require
 // 1 BIPUSH 111\n {4}DLOAD 0\n {4}DLOAD 2\n {4}DLOAD 4\n {4}DLOAD 6\n {4}.*toDPointOrNull.*\n {4}INVOKESTATIC .*equals-impl .*\n {4}INVOKESTATIC .*require

compiler/testData/codegen/bytecodeText/valueClasses/mfvcDeclaration.kt

@@ -51,27 +51,27 @@ fun functionWithoutBoxes(x: D, y: D) {
 // 2 INVOKESTATIC D.constructor-impl \(IILjava/lang/String;\)V
 // 2 INVOKESTATIC C.constructor-impl \(IILjava/lang/String;\)V
 // 1 public final getX\(\)LC;
-// 1 public final synthetic unbox-impl-0-0\(\)I
-// 1 public final synthetic unbox-impl-0-1\(\)I
-// 1 public final synthetic unbox-impl-0-2\(\)Ljava/lang/String;
+// 1 public final synthetic unbox-impl-x\(\)I
+// 1 public final synthetic unbox-impl-y\(\)I
+// 1 public final synthetic unbox-impl-z\(\)Ljava/lang/String;
 // 2 private synthetic <init>\(IILjava/lang/String;\)V
 // 1 public final static synthetic box-impl\(IILjava/lang/String;\)LD;
 // 1 public final static synthetic box-impl\(IILjava/lang/String;\)LC;
-// 1 public final synthetic unbox-impl-0\(\)I
-// 1 public final synthetic unbox-impl-1\(\)I
-// 1 public final synthetic unbox-impl-2\(\)Ljava/lang/String;
-// 1 private final I field-0-0\n
-// 1 private final I field-0-1\n
-// 1 private final Ljava/lang/String; field-0-2\n
-// 0 private final LC; (field.*)x\n
-// 1 private final I x\n
-// 1 private final I field-0\n
-// 1 private final I field-1\n
-// 1 private final Ljava/lang/String; field-2\n
+// 1 public final synthetic unbox-impl-x\(\)LC;
+// 1 public final synthetic unbox-impl-x-x\(\)I
+// 1 public final synthetic unbox-impl-x-y\(\)I
+// 1 public final synthetic unbox-impl-x-z\(\)Ljava/lang/String;
+// 2 private final I x\n
+// 1 private final I y\n
+// 1 private final Ljava/lang/String; z\n
+// 0 private final LC; (.*)x\n
+// 1 private final I x-x\n
+// 1 private final I x-y\n
+// 1 private final Ljava/lang/String; x-z\n
 // 1 INVOKESPECIAL C.<init> \(IILjava/lang/String;\)V
 // 1 INVOKESPECIAL D.<init> \(IILjava/lang/String;\)V
 // 2 INVOKESTATIC D.box-impl \(IILjava/lang/String;\)LD;
 // 3 INVOKESTATIC C.box-impl \(IILjava/lang/String;\)LC;
 // 1 public final static functionWithoutBoxes-GPBa7dw\(IILjava/lang/String;IILjava/lang/String;\)V
 // 0 functionWithoutBoxes.*(\n {3}.*)*(\n {4}(NEW [ABCD]|.*(box|[ABCD]\.<init>|LA;|LB;|LC;|LD;)))
-// 1 privateAccess.*(\n   .+)*(\n    GETFIELD Regular\.x-0-0 : I)(\n   .+)*(\n    INVOKEVIRTUAL Regular\.getX-0 \(\)LC;)(\n   .+)*(\n    INVOKESPECIAL Regular\.getX \(\)LD;)
+// 1 privateAccess.*(\n   .+)*(\n    GETFIELD Regular\.x-x-x : I)(\n   .+)*(\n    INVOKEVIRTUAL Regular\.getX-x \(\)LC;)(\n   .+)*(\n    INVOKESPECIAL Regular\.getX \(\)LD;)

compiler/testData/codegen/bytecodeText/valueClasses/regularClassWithMFVC.kt

@@ -75,20 +75,20 @@ fun trySetSegment(segment: DSegment) {
 
 // 0 public final getOpposite\(\)LDPoint;
 // 1 public final static getOpposite-impl\(DD\)LDPoint;
-// 1 private D p1-0
-// 1 private D p1-1
+// 1 private D p1-x
+// 1 private D p1-y
 // 0 private DPoint; p1
-// 1 private D p2-0
-// 1 private D p2-1
+// 1 private D p2-x
+// 1 private D p2-y
 // 0 private DPoint; p2
-// 1 private D point1WithBackingFieldAndDefaultGetter-0
-// 1 private D point1WithBackingFieldAndDefaultGetter-1
+// 1 private D point1WithBackingFieldAndDefaultGetter-x
+// 1 private D point1WithBackingFieldAndDefaultGetter-y
 // 0 private DPoint; point1WithBackingFieldAndDefaultGetter
-// 1 private D point2WithBackingFieldAndDefaultGetter-0
-// 1 private D point2WithBackingFieldAndDefaultGetter-1
+// 1 private D point2WithBackingFieldAndDefaultGetter-x
+// 1 private D point2WithBackingFieldAndDefaultGetter-y
 // 0 private DPoint; point2WithBackingFieldAndDefaultGetter
-// 1 private D pointWithBackingFieldAndCustomGetter-0
-// 1 private D pointWithBackingFieldAndCustomGetter-1
+// 1 private D pointWithBackingFieldAndCustomGetter-x
+// 1 private D pointWithBackingFieldAndCustomGetter-y
 // 0 private DPoint; pointWithBackingFieldAndCustomGetter
 // 0 private DPoint; notImplemented
 // 0 private D notImplemented
@@ -101,25 +101,32 @@ fun trySetSegment(segment: DSegment) {
 // 1 public final getP2\(\)LDPoint;
 // 1 public final setP2-sUp7gFk\(DD\)V
 // 1 public final getCenter\(\)LDPoint;
+// 1 public final synthetic getCenter-x\(\)D
+// 1 public final synthetic getCenter-y\(\)D
 // 1 public final getNotImplemented\(\)LDPoint;
+// 1 public final synthetic getNotImplemented-x\(\)D
+// 1 public final synthetic getNotImplemented-y\(\)D
 // 1 public final setNotImplemented-sUp7gFk\(DD\)V
 // 1 public final getPoint1WithBackingFieldAndDefaultGetter\(\)LDPoint;
+// 1 public final synthetic getPoint1WithBackingFieldAndDefaultGetter-x\(\)D
+// 1 public final synthetic getPoint1WithBackingFieldAndDefaultGetter-y\(\)D
 // 1 public final setPoint1WithBackingFieldAndDefaultGetter-sUp7gFk\(DD\)V
 // 1 public final getPoint2WithBackingFieldAndDefaultGetter\(\)LDPoint;
+// 1 public final synthetic getPoint2WithBackingFieldAndDefaultGetter-x\(\)D
+// 1 public final synthetic getPoint2WithBackingFieldAndDefaultGetter-y\(\)D
 // 1 public final setPoint2WithBackingFieldAndDefaultGetter-sUp7gFk\(DD\)V
 // 1 public final getPointWithBackingFieldAndCustomGetter\(\)LDPoint;
+// 1 public final synthetic getPointWithBackingFieldAndCustomGetter-x\(\)D
+// 1 public final synthetic getPointWithBackingFieldAndCustomGetter-y\(\)D
 // 1 public final setPointWithBackingFieldAndCustomGetter-sUp7gFk\(DD\)V
-// 1 public final synthetic getP1-0\(\)D
-// 1 public final synthetic getP1-1\(\)D
-// 1 public final synthetic getP2-0\(\)D
-// 1 public final synthetic getP2-1\(\)D
-// 1 public final synthetic getPoint1WithBackingFieldAndDefaultGetter-0\(\)D
-// 1 public final synthetic getPoint1WithBackingFieldAndDefaultGetter-1\(\)D
-// 1 public final synthetic getPoint2WithBackingFieldAndDefaultGetter-0\(\)D
-// 1 public final synthetic getPoint2WithBackingFieldAndDefaultGetter-1\(\)D
-// 0 public final getCenter\$
-// 0 public final getNotImplemented\$
-// 0 public final getPointWithBackingFieldAndCustomGetter\$
+// 1 public final synthetic getP1-x\(\)D
+// 1 public final synthetic getP1-y\(\)D
+// 1 public final synthetic getP2-x\(\)D
+// 1 public final synthetic getP2-y\(\)D
+// 1 public final synthetic getPoint1WithBackingFieldAndDefaultGetter-x\(\)D
+// 1 public final synthetic getPoint1WithBackingFieldAndDefaultGetter-y\(\)D
+// 1 public final synthetic getPoint2WithBackingFieldAndDefaultGetter-x\(\)D
+// 1 public final synthetic getPoint2WithBackingFieldAndDefaultGetter-y\(\)D
 // 0 ^ {2}\b.*get.*\$.*(\n {3}.*)*(\n {4}.*\.box)
 // 1 tryGetSegment\(LDSegment;\)V
 // 0 try[GS]etSegment\(LDSegment;\)V.*(\n {3}.*)*(\n {4}.*\.box)
@@ -140,6 +147,6 @@ fun trySetSegment(segment: DSegment) {
 // 1 trySetSegment\(LDSegment;\)V.*((\n {3}.*)*(\n {4}INVOKEVIRTUAL DSegment\.setP2-sUp7gFk \(DD\)V)){1}
 // 0 trySetSegment\(LDSegment;\)V.*((\n {3}.*)*(\n {4}INVOKEVIRTUAL DSegment\.setP2-sUp7gFk \(DD\)V)){2}
 // 0 try[GS]etSegment\(LDSegment;\)V.*(\n {3}.*)*(\n {4}INVOKEVIRTUAL DPoint\.get[XY] \(\)D)
-// 1 tryGetSegment\(LDSegment;\)V.*((\n {3}.*)*?(\n {4}INVOKEVIRTUAL DSegment\.get.*-[01] \(\)D)){14}
-// 0 tryGetSegment\(LDSegment;\)V.*((\n {3}.*)*?(\n {4}INVOKEVIRTUAL DSegment\.get.*-[01] \(\)D)){15}
-// 0 trySetSegment\(LDSegment;\)V.*((\n {3}.*)*?(\n {4}INVOKEVIRTUAL DSegment\.get.*-[01] \(\)D)){1}
+// 1 tryGetSegment\(LDSegment;\)V.*((\n {3}.*)*?(\n {4}INVOKEVIRTUAL DSegment\.get.*-[xy] \(\)D)){14}
+// 0 tryGetSegment\(LDSegment;\)V.*((\n {3}.*)*?(\n {4}INVOKEVIRTUAL DSegment\.get.*-[xy] \(\)D)){15}
+// 0 trySetSegment\(LDSegment;\)V.*((\n {3}.*)*?(\n {4}INVOKEVIRTUAL DSegment\.get.*-[xy] \(\)D)){1}