[IR] Add context receivers test, fix a flattening fields bug

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

#KT-1179

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

@@ -1,7 +1,8 @@
+// IGNORE_BACKEND_FIR: JVM_IR
 // WITH_STDLIB
 // TARGET_BACKEND: JVM_IR
 // WORKS_WHEN_VALUE_CLASS
-// LANGUAGE: +ValueClasses
+// LANGUAGE: +ValueClasses +ContextReceivers
 // CHECK_BYTECODE_LISTING
 
 @JvmInline
@@ -10,21 +11,148 @@ value class IC(val x: UInt)
 fun ic(x: IC) = x.x
 
 @JvmInline
-value class SimpleMFVC(val x: UInt, val y: IC, val z: String)
+value class SimpleMfvc(val x: UInt, val y: IC, val z: String) {
+    companion object {
+        val SimpleMfvc.a1: SimpleMfvc
+            get() = this
 
-fun smfvc(ic: IC, x: SimpleMFVC, ic1: UInt) = ic(ic) + x.x + ic(x.y) + ic1
+        @JvmStatic
+        val SimpleMfvc.b1: SimpleMfvc
+            get() = this
+
+        context(b@SimpleMfvc)
+        val a2: SimpleMfvc
+            get() = this@b
+
+        context(b@SimpleMfvc)
+        @JvmStatic
+        val b2: SimpleMfvc
+            get() = this@b
+        
+        
+        private val SimpleMfvc.private1: SimpleMfvc
+            get() = this
+
+        @JvmStatic
+        private val SimpleMfvc.private2: SimpleMfvc
+            get() = this
+
+        context(b@SimpleMfvc)
+        private val private3: SimpleMfvc
+            get() = this@b
+
+        context(b@SimpleMfvc)
+        @JvmStatic
+        private val private4: SimpleMfvc
+            get() = this@b
+    }
+
+    val SimpleMfvc.a3: SimpleMfvc
+        get() = this
+
+    context(SimpleMfvc)
+    val b3: SimpleMfvc
+        get() = this@SimpleMfvc
+
+    
+    private val SimpleMfvc.private1: SimpleMfvc
+        get() = this@SimpleMfvc
+    context(SimpleMfvc)
+    private val private2: SimpleMfvc
+        get() = this@SimpleMfvc
+}
+
+fun smfvc(ic: IC, x: SimpleMfvc, ic1: UInt) = ic(ic) + x.x + ic(x.y) + ic1
 
 @JvmInline
-value class GreaterMFVC(val x: SimpleMFVC, val y: IC, val z: SimpleMFVC)
+value class GreaterMfvc(val x: SimpleMfvc, val y: IC, val z: SimpleMfvc)
 
-fun gmfvc(ic: IC, x: GreaterMFVC, ic1: UInt) = smfvc(ic, x.x, 0U) + ic(x.y) + smfvc(IC(0U), x.z, ic1)
+fun gmfvc(ic: IC, x: GreaterMfvc, ic1: UInt) = smfvc(ic, x.x, 0U) + ic(x.y) + smfvc(IC(0U), x.z, ic1)
+
+class Extensions {
+    val SimpleMfvc.x1: SimpleMfvc
+        get() = this
+    private val SimpleMfvc.private_: SimpleMfvc
+        get() = this
+
+    companion object {
+        val SimpleMfvc.y1: SimpleMfvc
+            get() = this
+
+        @JvmStatic
+        val SimpleMfvc.z1: SimpleMfvc
+            get() = this
+        
+        private val SimpleMfvc.private1: SimpleMfvc
+            get() = this
+
+        @JvmStatic
+        private val SimpleMfvc.private2: SimpleMfvc
+            get() = this
+    }
+}
+
+class Contexts {
+    context(b@SimpleMfvc)
+    val x1: SimpleMfvc
+        get() = this@b
+    context(b@SimpleMfvc)
+    private val private_: SimpleMfvc
+        get() = this@b
+
+    companion object {
+        context(b@SimpleMfvc)
+        val y1: SimpleMfvc
+            get() = this@b
+
+        context(b@SimpleMfvc)
+        @JvmStatic
+        val z1: SimpleMfvc
+            get() = this@b
+        
+        context(b@SimpleMfvc)
+        private val private1: SimpleMfvc
+            get() = this@b
+
+        context(b@SimpleMfvc)
+        @JvmStatic
+        private val private2: SimpleMfvc
+            get() = this@b
+    }
+}
+
+fun idUnboxed(x: SimpleMfvc) = x
+fun idBoxed(x: SimpleMfvc?) = x!!
 
 fun box(): String {
     val o1 = IC(2U)
     require(ic(o1) == 2U)
-    val o2 = SimpleMFVC(1U, o1, "3")
+    val o2 = SimpleMfvc(1U, o1, "3")
+    val o2_ = SimpleMfvc(1U, o1, "-3")
     require(smfvc(IC(4U), o2, 5U) == 12U)
-    val o3 = GreaterMFVC(o2, IC(6U), SimpleMFVC(7U, IC(8U), "9"))
+    val o3 = GreaterMfvc(o2, IC(6U), SimpleMfvc(7U, IC(8U), "9"))
     require(gmfvc(IC(10U), o3, 11U) == 45U)
+    with(Extensions()) {
+        require(o2.x1 == o2)
+    }
+    with(Extensions.Companion) {
+        require(o2.y1 == o2)
+        require(o2.z1 == o2)
+    }
+    with(o2) {
+        require(Contexts().x1 == o2)
+        require(Contexts.y1 == o2)
+        require(Contexts.z1 == o2)
+        require(o2_.a3 == o2_)
+        require(o2_.b3 == o2_)
+        require(SimpleMfvc.a2 == o2)
+        require(SimpleMfvc.b2 == o2)
+    }
+    with(SimpleMfvc.Companion) {
+        require(o2_.a1 == o2_)
+        require(o2_.b1 == o2_)
+    }
+    
+    require(idUnboxed(idBoxed(idUnboxed(o2) /*boxing*/) /*unbox*/) == o2)
     return "OK"
-}
+}

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

@@ -4,12 +4,73 @@ public final class ClassFlatteningKt {
     public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
     public final static method gmfvc-Ket90g4(p0: int, p1: int, p2: int, @org.jetbrains.annotations.NotNull p3: java.lang.String, p4: int, p5: int, p6: int, @org.jetbrains.annotations.NotNull p7: java.lang.String, p8: int): int
     public final static method ic-K5cTq2M(p0: int): int
+    public final static @org.jetbrains.annotations.NotNull method idBoxed(@org.jetbrains.annotations.Nullable p0: SimpleMfvc): SimpleMfvc
+    public final static @org.jetbrains.annotations.NotNull method idUnboxed-sUp7gFk(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): SimpleMfvc
     public final static method smfvc-Ket90g4(p0: int, p1: int, p2: int, @org.jetbrains.annotations.NotNull p3: java.lang.String, p4: int): int
+    public final inner class Contexts$Companion
+    public final inner class Extensions$Companion
+    public final inner class SimpleMfvc$Companion
+}
+
+@kotlin.Metadata
+public final class Contexts$Companion {
+    // source: 'classFlattening.kt'
+    private method <init>(): void
+    public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
+    public synthetic final static method access$getPrivate2-sUp7gFk(p0: Contexts$Companion, p1: int, p2: int, p3: java.lang.String): SimpleMfvc
+    private final method getPrivate1-sUp7gFk(p0: int, p1: int, p2: java.lang.String): SimpleMfvc
+    private synthetic deprecated static @kotlin.jvm.JvmStatic method getPrivate2$annotations(): void
+    private final method getPrivate2-sUp7gFk(p0: int, p1: int, p2: java.lang.String): SimpleMfvc
+    public final @org.jetbrains.annotations.NotNull method getY1-sUp7gFk(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): SimpleMfvc
+    public synthetic deprecated static @kotlin.jvm.JvmStatic method getZ1$annotations(): void
+    public final @org.jetbrains.annotations.NotNull method getZ1-sUp7gFk(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): SimpleMfvc
+    public final inner class Contexts$Companion
+}
+
+@kotlin.Metadata
+public final class Contexts {
+    // source: 'classFlattening.kt'
+    public final static @org.jetbrains.annotations.NotNull field Companion: Contexts$Companion
+    static method <clinit>(): void
+    public method <init>(): void
+    private final static method getPrivate2-sUp7gFk(p0: int, p1: int, p2: java.lang.String): SimpleMfvc
+    private final method getPrivate_-sUp7gFk(p0: int, p1: int, p2: java.lang.String): SimpleMfvc
+    public final @org.jetbrains.annotations.NotNull method getX1-sUp7gFk(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): SimpleMfvc
+    public final static @org.jetbrains.annotations.NotNull method getZ1-sUp7gFk(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): SimpleMfvc
+    public final inner class Contexts$Companion
+}
+
+@kotlin.Metadata
+public final class Extensions$Companion {
+    // source: 'classFlattening.kt'
+    private method <init>(): void
+    public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
+    public synthetic final static method access$getPrivate2-sUp7gFk(p0: Extensions$Companion, p1: int, p2: int, p3: java.lang.String): SimpleMfvc
+    private final method getPrivate1-sUp7gFk(p0: int, p1: int, p2: java.lang.String): SimpleMfvc
+    private synthetic deprecated static @kotlin.jvm.JvmStatic method getPrivate2$annotations(p0: SimpleMfvc): void
+    private final method getPrivate2-sUp7gFk(p0: int, p1: int, p2: java.lang.String): SimpleMfvc
+    public final @org.jetbrains.annotations.NotNull method getY1-sUp7gFk(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): SimpleMfvc
+    public synthetic deprecated static @kotlin.jvm.JvmStatic method getZ1$annotations(p0: SimpleMfvc): void
+    public final @org.jetbrains.annotations.NotNull method getZ1-sUp7gFk(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): SimpleMfvc
+    public final inner class Extensions$Companion
+}
+
+@kotlin.Metadata
+public final class Extensions {
+    // source: 'classFlattening.kt'
+    public final static @org.jetbrains.annotations.NotNull field Companion: Extensions$Companion
+    static method <clinit>(): void
+    public method <init>(): void
+    private final static method getPrivate2-sUp7gFk(p0: int, p1: int, p2: java.lang.String): SimpleMfvc
+    private final method getPrivate_-sUp7gFk(p0: int, p1: int, p2: java.lang.String): SimpleMfvc
+    public final @org.jetbrains.annotations.NotNull method getX1-sUp7gFk(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): SimpleMfvc
+    public final static @org.jetbrains.annotations.NotNull method getZ1-sUp7gFk(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): SimpleMfvc
+    public final inner class Extensions$Companion
 }
 
 @kotlin.jvm.JvmInline
 @kotlin.Metadata
-public final class GreaterMFVC {
+public final class GreaterMfvc {
     // source: 'classFlattening.kt'
     private final field field-0-0: int
     private final field field-0-1: int
@@ -19,24 +80,24 @@ public final class GreaterMFVC {
     private final field field-2-1: int
     private final @org.jetbrains.annotations.NotNull field field-2-2: 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 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
     public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public static method equals-impl(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: int, p6: java.lang.String, p7: java.lang.Object): boolean
     public final static method equals-impl0(p0: int, p1: int, p2: java.lang.String, 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: java.lang.String): boolean
-    public final static @org.jetbrains.annotations.NotNull method getX-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): SimpleMFVC
-    public final static method getY-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): int
-    public final static @org.jetbrains.annotations.NotNull method getZ-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): SimpleMFVC
+    public final @org.jetbrains.annotations.NotNull method getX(): SimpleMfvc
+    public final method getY-fhib4bs(): int
+    public final @org.jetbrains.annotations.NotNull method getZ(): SimpleMfvc
     public method hashCode(): int
     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(): 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(): 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
@@ -61,22 +122,54 @@ public final class IC {
     public synthetic final method unbox-impl(): int
 }
 
+@kotlin.Metadata
+public final class SimpleMfvc$Companion {
+    // source: 'classFlattening.kt'
+    private method <init>(): void
+    public synthetic method <init>(p0: kotlin.jvm.internal.DefaultConstructorMarker): void
+    public synthetic final static method access$getPrivate2-sUp7gFk(p0: SimpleMfvc$Companion, p1: int, p2: int, p3: java.lang.String): SimpleMfvc
+    public synthetic final static method access$getPrivate4-sUp7gFk(p0: SimpleMfvc$Companion, p1: int, p2: int, p3: java.lang.String): SimpleMfvc
+    public final @org.jetbrains.annotations.NotNull method getA1-sUp7gFk(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): SimpleMfvc
+    public final @org.jetbrains.annotations.NotNull method getA2-sUp7gFk(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): SimpleMfvc
+    public synthetic deprecated static @kotlin.jvm.JvmStatic method getB1$annotations(p0: SimpleMfvc): void
+    public final @org.jetbrains.annotations.NotNull method getB1-sUp7gFk(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): SimpleMfvc
+    public synthetic deprecated static @kotlin.jvm.JvmStatic method getB2$annotations(): void
+    public final @org.jetbrains.annotations.NotNull method getB2-sUp7gFk(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): SimpleMfvc
+    private final method getPrivate1-sUp7gFk(p0: int, p1: int, p2: java.lang.String): SimpleMfvc
+    private synthetic deprecated static @kotlin.jvm.JvmStatic method getPrivate2$annotations(p0: SimpleMfvc): void
+    private final method getPrivate2-sUp7gFk(p0: int, p1: int, p2: java.lang.String): SimpleMfvc
+    private final method getPrivate3-sUp7gFk(p0: int, p1: int, p2: java.lang.String): SimpleMfvc
+    private synthetic deprecated static @kotlin.jvm.JvmStatic method getPrivate4$annotations(): void
+    private final method getPrivate4-sUp7gFk(p0: int, p1: int, p2: java.lang.String): SimpleMfvc
+    public final inner class SimpleMfvc$Companion
+}
+
 @kotlin.jvm.JvmInline
 @kotlin.Metadata
-public final class SimpleMFVC {
+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
+    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
+    public synthetic final static method box-impl(p0: int, p1: int, p2: java.lang.String): SimpleMfvc
     public final static method constructor-impl(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): void
     public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public static method equals-impl(p0: int, p1: int, p2: java.lang.String, p3: java.lang.Object): boolean
     public final static method equals-impl0(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: java.lang.String): boolean
-    public final static method getX-impl(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): int
-    public final static method getY-impl(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): int
-    public final static @org.jetbrains.annotations.NotNull method getZ-impl(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): java.lang.String
+    public final static @org.jetbrains.annotations.NotNull method getA3-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): SimpleMfvc
+    public final static @org.jetbrains.annotations.NotNull method getB1-sUp7gFk(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): SimpleMfvc
+    public final static @org.jetbrains.annotations.NotNull method getB2-sUp7gFk(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): SimpleMfvc
+    public final static @org.jetbrains.annotations.NotNull method getB3-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): SimpleMfvc
+    private final static method getPrivate1-sUp7gFk(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: java.lang.String): SimpleMfvc
+    private final static method getPrivate2-sUp7gFk(p0: int, p1: int, p2: java.lang.String): SimpleMfvc
+    private final static method getPrivate2-sUp7gFk(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: java.lang.String): SimpleMfvc
+    private final static method getPrivate4-sUp7gFk(p0: int, p1: int, p2: java.lang.String): SimpleMfvc
+    public final method getX-pVg5ArA(): int
+    public final method getY-fhib4bs(): int
+    public final @org.jetbrains.annotations.NotNull method getZ(): java.lang.String
     public method hashCode(): int
     public static method hashCode-impl(p0: int, p1: int, p2: java.lang.String): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
@@ -84,4 +177,5 @@ public final class SimpleMFVC {
     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 final inner class SimpleMfvc$Companion
 }

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

@@ -21,7 +21,7 @@ value class D(val x: C) {
     constructor(x: Int, y: UInt, z: Int) : this(C(x, B(y), z.toString()))
 
     init {
-        println(x.x)
+        supply(x.x)
     }
 }
 
@@ -46,18 +46,18 @@ interface Base3 {
 value class R<T : Any>(val x: Int, val y: UInt, override val z: E, val t: A<T>) : Base1, Base3
 
 fun <T : List<Int>> f(r: R<T>) {
-    println(r)
-    println(r.x)
-    println(r.y)
-    println(r.z)
-    println(r.t)
-    println(r.t.x)
-    println(r.z.x)
-    println(r.z.x.x)
-    println(r.z.x.x.x)
-    println(r.z.x.x.y)
-    println(r.z.x.x.z)
-    println(r.z.x.x.y.x)
+    supply(r)
+    supply(r.x)
+    supply(r.y)
+    supply(r.z)
+    supply(r.t)
+    supply(r.t.x)
+    supply(r.z.x)
+    supply(r.z.x.x)
+    supply(r.z.x.x.x)
+    supply(r.z.x.x.y)
+    supply(r.z.x.x.z)
+    supply(r.z.x.x.y.x)
 }
 
 fun g(e: E) {
@@ -71,19 +71,19 @@ fun <T : List<Int>> h(r: R<T>) {
     D(C(2, B(3U), ""))
     val x = D(C(2, B(3U), ""))
     var y = D(C(4, B(5U), "1"))
-    println(y)
+    supply(y)
     y = D(C(6, B(7U), "2"))
     y = D(6, 7U, 2)
     y = inlined(6, 7U, 2)
     y = notInlined(6, 7U, 2)
-    println(y)
+    supply(y)
 }
 
 fun h1() {
     var y = inlined(1, 2U, 3) // todo fix box
-    println(y)
+    supply(y)
     y = inlined(4, 5U, 6)
-    println(y)
+    supply(y)
 }
 
 interface Base1 {
@@ -118,22 +118,22 @@ class NotInlined(override var l: R<List<Int>>, var y: Int) : Base1, Base2, Base4
 
     var withNonTrivialSettersWithBF: R<List<Int>> = l
         get() {
-            println("1")
+            supply("1")
             field
             field.t
             field == field
             return field
         }
         set(value) {
-            println("3")
+            supply("3")
             field = value
             field = field
-            println("4")
+            supply("4")
         }
 
     val withNonTrivialGettersWithBF: R<List<Int>> = l
         get() {
-            println("1")
+            supply("1")
             field
             field.t
             field == field
@@ -146,7 +146,7 @@ fun testVars(x: NotInlined) {
     var y = x.l
     y.toString()
     y = x.l
-    println(y)
+    supply(y)
     x.l = x.l
     x.l = R<List<Int>>(x.l.x, x.l.y, x.l.z, x.l.t)
 }
@@ -155,7 +155,7 @@ fun reuseBoxed(list: MutableList<R<List<Int>>>) {
     list.add(list.last())
 }
 
-fun supply(x: Boolean) {}
+fun supply(x: Any) {}
 
 fun equalsChecks1(x: A<List<Int>>) {}
 fun equalsChecks(left: R<List<Int>>, right: R<List<Int>>) {

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

@@ -117,9 +117,9 @@ public final class C {
     public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public static method equals-impl(p0: int, p1: int, p2: java.lang.String, p3: java.lang.Object): boolean
     public final static method equals-impl0(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: java.lang.String): boolean
-    public final static method getX-impl(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): int
-    public final static method getY-impl(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): int
-    public final static @org.jetbrains.annotations.NotNull method getZ-impl(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): java.lang.String
+    public final method getX(): int
+    public final method getY-GsR9Xnw(): int
+    public final @org.jetbrains.annotations.NotNull method getZ(): java.lang.String
     public method hashCode(): int
     public static method hashCode-impl(p0: int, p1: int, p2: java.lang.String): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
@@ -142,7 +142,7 @@ public final class ComplexKt {
     public final static @org.jetbrains.annotations.NotNull method inlined-OsBMiQA(p0: int, p1: int, p2: int): D
     public final static @org.jetbrains.annotations.NotNull method notInlined-OsBMiQA(p0: int, p1: int, p2: int): D
     public final static method reuseBoxed(@org.jetbrains.annotations.NotNull p0: java.util.List): void
-    public final static method supply(p0: boolean): void
+    public final static method supply(@org.jetbrains.annotations.NotNull p0: java.lang.Object): void
     public final static method testVars(@org.jetbrains.annotations.NotNull p0: NotInlined): void
 }
 
@@ -160,7 +160,7 @@ public final class D {
     public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public static method equals-impl(p0: int, p1: int, p2: java.lang.String, p3: java.lang.Object): boolean
     public final static method equals-impl0(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: java.lang.String): boolean
-    public final static @org.jetbrains.annotations.NotNull method getX-impl(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): C
+    public final @org.jetbrains.annotations.NotNull method getX(): C
     public method hashCode(): int
     public static method hashCode-impl(p0: int, p1: int, p2: java.lang.String): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
@@ -185,7 +185,7 @@ public final class E {
     public static method equals-impl(p0: int, p1: int, p2: java.lang.String, p3: java.lang.Object): boolean
     public final static method equals-impl0(p0: int, p1: int, p2: java.lang.String, p3: int, p4: int, p5: java.lang.String): boolean
     public final static @org.jetbrains.annotations.NotNull method getWithNonTrivialSetters-impl(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): D
-    public final static @org.jetbrains.annotations.NotNull method getX-impl(p0: int, p1: int, @org.jetbrains.annotations.NotNull p2: java.lang.String): D
+    public final @org.jetbrains.annotations.NotNull method getX(): D
     public method hashCode(): int
     public static method hashCode-impl(p0: int, p1: int, p2: java.lang.String): int
     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
@@ -296,16 +296,15 @@ public final class R {
     public static @org.jetbrains.annotations.NotNull method getFakeOverrideMFVC-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): R
     public method getFakeOverrideRegular(): int
     public static method getFakeOverrideRegular-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): int
-    public final static @org.jetbrains.annotations.NotNull method getT-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): java.util.List
-    public final static method getX-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): int
-    public final static method getY-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): int
+    public final @org.jetbrains.annotations.NotNull method getT-GKOAj6k(): java.util.List
+    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 static @org.jetbrains.annotations.NotNull method getZ-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): E
     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

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

@@ -38,8 +38,8 @@ public final class DPoint {
     public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean
     public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean
     public final static method getCounter(): int
-    public final static method getX-impl(p0: double, p1: double): double
-    public final static method getY-impl(p0: double, p1: double): double
+    public final method getX(): double
+    public final method getY(): double
     public method hashCode(): int
     public static method hashCode-impl(p0: double, p1: double): int
     public final static method setCounter(p0: int): void

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

@@ -18,15 +18,15 @@ public final class A {
     public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public static method equals-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: java.lang.Object): boolean
     public final static method equals-impl0(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): boolean
-    public final static method getF1-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): int
-    public final static method getF2-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): int
-    public final static @org.jetbrains.annotations.NotNull method getF3-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): F3
-    public final static method getF4-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): int
-    public final static method getF5-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): int
-    public final static @org.jetbrains.annotations.NotNull method getF6-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): java.lang.String
-    public final static method getF7-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): int
-    public final static method getF8-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): int
-    public final static @org.jetbrains.annotations.NotNull method getF9-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): java.lang.String
+    public final method getF1-DbFnDB4(): int
+    public final method getF2-ejSTSP4(): int
+    public final @org.jetbrains.annotations.NotNull method getF3(): F3
+    public final method getF4-4yoqybc(): int
+    public final method getF5-z3qHWqM(): int
+    public final @org.jetbrains.annotations.NotNull method getF6-OgMO970(): java.lang.String
+    public final method getF7(): int
+    public final method getF8-pVg5ArA(): int
+    public final @org.jetbrains.annotations.NotNull method getF9(): java.lang.String
     public method hashCode(): int
     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
@@ -74,8 +74,8 @@ public final class B {
     public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public static method equals-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, p20: java.lang.Object): boolean
     public final static method equals-impl0(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, p20: int, p21: int, p22: int, p23: int, p24: int, p25: int, p26: java.lang.String, p27: int, p28: int, p29: java.lang.String, p30: int, p31: int, p32: int, p33: int, p34: int, p35: int, p36: java.lang.String, p37: int, p38: int, p39: java.lang.String): boolean
-    public final static @org.jetbrains.annotations.NotNull method getA1-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): A
-    public final static @org.jetbrains.annotations.NotNull method getA2-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): A
+    public final @org.jetbrains.annotations.NotNull method getA1(): A
+    public final @org.jetbrains.annotations.NotNull method getA2(): A
     public method hashCode(): int
     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
@@ -162,8 +162,8 @@ public final class F3 {
     public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public static method equals-impl(p0: int, p1: int, p2: java.lang.Object): boolean
     public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean
-    public final static method getX-impl(p0: int, p1: int): int
-    public final static method getY-impl(p0: int, p1: int): int
+    public final method getX-DbFnDB4(): int
+    public final method getY-ejSTSP4(): int
     public method hashCode(): int
     public static method hashCode-impl(p0: int, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String

compiler/testData/codegen/box/valueClasses/forStatement.kt

@@ -0,0 +1,18 @@
+// https://youtrack.jetbrains.com/issue/KT-52236/Different-modality-in-psi-and-fir
+// CHECK_BYTECODE_LISTING
+// WITH_STDLIB
+// TARGET_BACKEND: JVM_IR
+// WORKS_WHEN_VALUE_CLASS
+// LANGUAGE: +ValueClasses
+
+@JvmInline
+value class DPoint(val x: Double, val y: Double)
+
+fun box(): String {
+    var res = 0.0
+    for (x in listOf(DPoint(1.0, 2.0), DPoint(3.0, 4.0))) {
+        res += x.x + x.y
+    }
+    require(res == 10.0)
+    return "OK"
+}

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

@@ -0,0 +1,27 @@
+@kotlin.jvm.JvmInline
+@kotlin.Metadata
+public final class DPoint {
+    // source: 'forStatement.kt'
+    private final field field-0: double
+    private final field field-1: 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
+    public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
+    public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean
+    public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean
+    public final method getX(): double
+    public final method getY(): double
+    public method hashCode(): int
+    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
+}
+
+@kotlin.Metadata
+public final class ForStatementKt {
+    // source: 'forStatement.kt'
+    public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
+}

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

@@ -44,8 +44,8 @@ public final class DPoint {
     public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean
     public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean
-    public final static method getX-impl(p0: double, p1: double): double
-    public final static method getY-impl(p0: double, p1: double): double
+    public final method getX(): double
+    public final method getY(): double
     public method hashCode(): int
     public static method hashCode-impl(p0: double, p1: double): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String

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

@@ -26,10 +26,8 @@ public final class DPoint {
     public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean
     public @org.jetbrains.annotations.NotNull method getX(): java.lang.Double
     public synthetic bridge method getX(): java.lang.Object
-    public static @org.jetbrains.annotations.NotNull method getX-impl(p0: double, p1: double): java.lang.Double
     public @org.jetbrains.annotations.NotNull method getY(): java.lang.Double
     public synthetic bridge method getY(): java.lang.Object
-    public static @org.jetbrains.annotations.NotNull method getY-impl(p0: double, p1: double): java.lang.Double
     public method hashCode(): int
     public static method hashCode-impl(p0: double, p1: double): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
@@ -57,8 +55,8 @@ public final class DPointWithInterface {
     public static @org.jetbrains.annotations.NotNull method getSomethingMFVC-impl(p0: double, p1: double): DPoint
     public method getSomethingRegular(): int
     public static method getSomethingRegular-impl(p0: double, p1: double): int
-    public final static method getX-impl(p0: double, p1: double): double
-    public final static method getY-impl(p0: double, p1: double): double
+    public final method getX(): double
+    public final method getY(): double
     public method hashCode(): int
     public static method hashCode-impl(p0: double, p1: double): int
     public synthetic bridge method setSomethingGeneric(p0: java.lang.Object): void
@@ -90,10 +88,8 @@ public final class DSegment {
     public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double, p4: double, p5: double, p6: double, p7: double): boolean
     public @org.jetbrains.annotations.NotNull method getP1(): DPoint
     public synthetic bridge method getP1(): java.lang.Object
-    public static @org.jetbrains.annotations.NotNull method getP1-impl(p0: double, p1: double, p2: double, p3: double): DPoint
     public @org.jetbrains.annotations.NotNull method getP2(): DPoint
     public synthetic bridge method getP2(): java.lang.Object
-    public static @org.jetbrains.annotations.NotNull method getP2-impl(p0: double, p1: double, p2: double, p3: double): DPoint
     public method hashCode(): int
     public static method hashCode-impl(p0: double, p1: double, p2: double, p3: double): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
@@ -147,8 +143,8 @@ public final class GenericFakeOverrideMFVC {
     public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean
     public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean
-    public final static method getField1-impl(p0: double, p1: double): double
-    public final static method getField2-impl(p0: double, p1: double): double
+    public final method getField1(): double
+    public final method getField2(): double
     public @org.jetbrains.annotations.NotNull method getP(): DPoint
     public synthetic bridge method getP(): java.lang.Object
     public static @org.jetbrains.annotations.NotNull method getP-impl(p0: double, p1: double): DPoint
@@ -182,8 +178,8 @@ public final class GenericFakeOverrideMFVCWithMFVCUpperBound {
     public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean
     public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean
-    public final static method getField1-impl(p0: double, p1: double): double
-    public final static method getField2-impl(p0: double, p1: double): double
+    public final method getField1(): double
+    public final method getField2(): double
     public @org.jetbrains.annotations.NotNull method getP(): DPoint
     public static @org.jetbrains.annotations.NotNull method getP-impl(p0: double, p1: double): DPoint
     public @org.jetbrains.annotations.NotNull method getP1(): DPoint
@@ -2509,8 +2505,8 @@ public final class ReifiedFakeOverrideMFVC {
     public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean
     public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean
-    public final static method getField1-impl(p0: double, p1: double): double
-    public final static method getField2-impl(p0: double, p1: double): double
+    public final method getField1(): double
+    public final method getField2(): double
     public @org.jetbrains.annotations.NotNull method getP(): DPoint
     public static @org.jetbrains.annotations.NotNull method getP-impl(p0: double, p1: double): DPoint
     public @org.jetbrains.annotations.NotNull method getP1(): DPoint

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

@@ -26,10 +26,8 @@ public final class DPoint {
     public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean
     public synthetic bridge method getX(): java.lang.Object
     public method getX-3cLST_U(): double
-    public static method getX-impl(p0: double, p1: double): double
     public synthetic bridge method getY(): java.lang.Object
     public method getY-3cLST_U(): double
-    public static method getY-impl(p0: double, p1: double): double
     public method hashCode(): int
     public static method hashCode-impl(p0: double, p1: double): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
@@ -57,8 +55,8 @@ public final class DPointWithInterface {
     public static @org.jetbrains.annotations.NotNull method getSomethingMFVC-impl(p0: double, p1: double): DPoint
     public method getSomethingRegular(): int
     public static method getSomethingRegular-impl(p0: double, p1: double): int
-    public final static method getX-impl(p0: double, p1: double): double
-    public final static method getY-impl(p0: double, p1: double): double
+    public final method getX-3cLST_U(): double
+    public final method getY-3cLST_U(): double
     public method hashCode(): int
     public static method hashCode-impl(p0: double, p1: double): int
     public synthetic bridge method setSomethingGeneric(p0: java.lang.Object): void
@@ -90,10 +88,8 @@ public final class DSegment {
     public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double, p4: double, p5: double, p6: double, p7: double): boolean
     public @org.jetbrains.annotations.NotNull method getP1(): DPoint
     public synthetic bridge method getP1(): java.lang.Object
-    public static @org.jetbrains.annotations.NotNull method getP1-impl(p0: double, p1: double, p2: double, p3: double): DPoint
     public @org.jetbrains.annotations.NotNull method getP2(): DPoint
     public synthetic bridge method getP2(): java.lang.Object
-    public static @org.jetbrains.annotations.NotNull method getP2-impl(p0: double, p1: double, p2: double, p3: double): DPoint
     public method hashCode(): int
     public static method hashCode-impl(p0: double, p1: double, p2: double, p3: double): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
@@ -147,8 +143,8 @@ public final class GenericFakeOverrideMFVC {
     public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean
     public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean
-    public final static method getField1-impl(p0: double, p1: double): double
-    public final static method getField2-impl(p0: double, p1: double): double
+    public final method getField1-3cLST_U(): double
+    public final method getField2-3cLST_U(): double
     public @org.jetbrains.annotations.NotNull method getP(): DPoint
     public synthetic bridge method getP(): java.lang.Object
     public static @org.jetbrains.annotations.NotNull method getP-impl(p0: double, p1: double): DPoint
@@ -182,8 +178,8 @@ public final class GenericFakeOverrideMFVCWithMFVCUpperBound {
     public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean
     public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean
-    public final static method getField1-impl(p0: double, p1: double): double
-    public final static method getField2-impl(p0: double, p1: double): double
+    public final method getField1-3cLST_U(): double
+    public final method getField2-3cLST_U(): double
     public @org.jetbrains.annotations.NotNull method getP(): DPoint
     public static @org.jetbrains.annotations.NotNull method getP-impl(p0: double, p1: double): DPoint
     public @org.jetbrains.annotations.NotNull method getP1(): DPoint
@@ -2526,8 +2522,8 @@ public final class ReifiedFakeOverrideMFVC {
     public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean
     public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean
-    public final static method getField1-impl(p0: double, p1: double): double
-    public final static method getField2-impl(p0: double, p1: double): double
+    public final method getField1-3cLST_U(): double
+    public final method getField2-3cLST_U(): double
     public @org.jetbrains.annotations.NotNull method getP(): DPoint
     public static @org.jetbrains.annotations.NotNull method getP-impl(p0: double, p1: double): DPoint
     public @org.jetbrains.annotations.NotNull method getP1(): DPoint

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

@@ -53,8 +53,8 @@ public final class GenericFakeOverrideMFVC {
     public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public static method equals-impl(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean
     public final static method equals-impl0(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): boolean
-    public final static method getField1-impl(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object
-    public final static method getField2-impl(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object
+    public final method getField1(): java.lang.Object
+    public final method getField2(): java.lang.Object
     public @org.jetbrains.annotations.NotNull method getP(): XPoint
     public synthetic bridge method getP(): java.lang.Object
     public static @org.jetbrains.annotations.NotNull method getP-impl(p0: java.lang.Object, p1: java.lang.Object): XPoint
@@ -88,8 +88,8 @@ public final class GenericFakeOverrideMFVCWithMFVCUpperBound {
     public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public static method equals-impl(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean
     public final static method equals-impl0(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): boolean
-    public final static method getField1-impl(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object
-    public final static method getField2-impl(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object
+    public final method getField1(): java.lang.Object
+    public final method getField2(): java.lang.Object
     public @org.jetbrains.annotations.NotNull method getP(): XPoint
     public static @org.jetbrains.annotations.NotNull method getP-impl(p0: java.lang.Object, p1: java.lang.Object): XPoint
     public @org.jetbrains.annotations.NotNull method getP1(): XPoint
@@ -2417,8 +2417,8 @@ public final class ReifiedFakeOverrideMFVC {
     public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public static method equals-impl(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean
     public final static method equals-impl0(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): boolean
-    public final static method getField1-impl(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object
-    public final static method getField2-impl(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object
+    public final method getField1(): java.lang.Object
+    public final method getField2(): java.lang.Object
     public @org.jetbrains.annotations.NotNull method getP(): XPoint
     public static @org.jetbrains.annotations.NotNull method getP-impl(p0: java.lang.Object, p1: java.lang.Object): XPoint
     public @org.jetbrains.annotations.NotNull method getP1(): XPoint
@@ -2534,9 +2534,7 @@ public final class XPoint {
     public static method equals-impl(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): boolean
     public final static method equals-impl0(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): boolean
     public method getX(): java.lang.Object
-    public static method getX-impl(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object
     public method getY(): java.lang.Object
-    public static method getY-impl(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object
     public method hashCode(): int
     public static method hashCode-impl(p0: java.lang.Object, p1: java.lang.Object): int
     public method someFunction1(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object): void
@@ -2568,8 +2566,8 @@ public final class XPointWithInterface {
     public static @org.jetbrains.annotations.NotNull method getSomethingMFVC-impl(p0: java.lang.Object, p1: java.lang.Object): XPoint
     public method getSomethingRegular(): int
     public static method getSomethingRegular-impl(p0: java.lang.Object, p1: java.lang.Object): int
-    public final static method getX-impl(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object
-    public final static method getY-impl(p0: java.lang.Object, p1: java.lang.Object): java.lang.Object
+    public final method getX(): java.lang.Object
+    public final method getY(): java.lang.Object
     public method hashCode(): int
     public static method hashCode-impl(p0: java.lang.Object, p1: java.lang.Object): int
     public synthetic bridge method setSomethingGeneric(p0: java.lang.Object): void
@@ -2601,10 +2599,8 @@ public final class XSegment {
     public final static method equals-impl0(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object, p4: java.lang.Object, p5: java.lang.Object, p6: java.lang.Object, p7: java.lang.Object): boolean
     public @org.jetbrains.annotations.NotNull method getP1(): XPoint
     public synthetic bridge method getP1(): java.lang.Object
-    public static @org.jetbrains.annotations.NotNull method getP1-impl(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): XPoint
     public @org.jetbrains.annotations.NotNull method getP2(): XPoint
     public synthetic bridge method getP2(): java.lang.Object
-    public static @org.jetbrains.annotations.NotNull method getP2-impl(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): XPoint
     public method hashCode(): int
     public static method hashCode-impl(p0: java.lang.Object, p1: java.lang.Object, p2: java.lang.Object, p3: java.lang.Object): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String

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

@@ -10,8 +10,8 @@ public final class DPoint {
     public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean
     public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean
-    public final static method getX-impl(p0: double, p1: double): double
-    public final static method getY-impl(p0: double, p1: double): double
+    public final method getX(): double
+    public final method getY(): double
     public method hashCode(): int
     public static method hashCode-impl(p0: double, p1: double): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String

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

@@ -10,8 +10,8 @@ public final class DPoint {
     public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public static method equals-impl(p0: double, p1: double, p2: java.lang.Object): boolean
     public final static method equals-impl0(p0: double, p1: double, p2: double, p3: double): boolean
-    public final static method getX-impl(p0: double, p1: double): double
-    public final static method getY-impl(p0: double, p1: double): double
+    public final method getX(): double
+    public final method getY(): double
     public method hashCode(): int
     public static method hashCode-impl(p0: double, p1: double): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String

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

@@ -41,10 +41,10 @@ public final class Internal {
     public static method equals-impl(p0: int, p1: int, p2: java.lang.Object): boolean
     public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean
     public final static @org.jetbrains.annotations.NotNull method getT(): Internal
+    public final method getX$main(): int
     public final static method getX(): int
-    public final static method getX-impl$main(p0: int, p1: int): int
+    public final method getY$main(): int
     public final static method getY(): int
-    public final static method getY-impl$main(p0: int, p1: int): int
     public method hashCode(): int
     public static method hashCode-impl(p0: int, p1: int): int
     public final static method setX(p0: int): void
@@ -67,7 +67,7 @@ public final class InternalInternal {
     public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public static method equals-impl(p0: int, p1: int, p2: java.lang.Object): boolean
     public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean
-    public final static @org.jetbrains.annotations.NotNull method getValue-impl$main(p0: int, p1: int): Internal
+    public final @org.jetbrains.annotations.NotNull method getValue$main(): Internal
     public method hashCode(): int
     public static method hashCode-impl(p0: int, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
@@ -89,7 +89,7 @@ public final class InternalPrivate {
     public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public static method equals-impl(p0: int, p1: int, p2: java.lang.Object): boolean
     public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean
-    public final static @org.jetbrains.annotations.NotNull method getValue-impl$main(p0: int, p1: int): Private
+    public final @org.jetbrains.annotations.NotNull method getValue$main(): Private
     public method hashCode(): int
     public static method hashCode-impl(p0: int, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
@@ -111,7 +111,7 @@ public final class InternalPublic {
     public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public static method equals-impl(p0: int, p1: int, p2: java.lang.Object): boolean
     public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean
-    public final static @org.jetbrains.annotations.NotNull method getValue-impl$main(p0: int, p1: int): Public
+    public final @org.jetbrains.annotations.NotNull method getValue$main(): Public
     public method hashCode(): int
     public static method hashCode-impl(p0: int, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
@@ -243,8 +243,8 @@ public final class Public {
     public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public static method equals-impl(p0: int, p1: int, p2: java.lang.Object): boolean
     public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean
-    public final static method getX-impl(p0: int, p1: int): int
-    public final static method getY-impl(p0: int, p1: int): int
+    public final method getX(): int
+    public final method getY(): int
     public method hashCode(): int
     public static method hashCode-impl(p0: int, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
@@ -266,7 +266,7 @@ public final class PublicInternal {
     public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public static method equals-impl(p0: int, p1: int, p2: java.lang.Object): boolean
     public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean
-    public final static @org.jetbrains.annotations.NotNull method getValue-impl(p0: int, p1: int): Internal
+    public final @org.jetbrains.annotations.NotNull method getValue(): Internal
     public method hashCode(): int
     public static method hashCode-impl(p0: int, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
@@ -288,7 +288,7 @@ public final class PublicPrivate {
     public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public static method equals-impl(p0: int, p1: int, p2: java.lang.Object): boolean
     public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean
-    public final static @org.jetbrains.annotations.NotNull method getValue-impl(p0: int, p1: int): Private
+    public final @org.jetbrains.annotations.NotNull method getValue(): Private
     public method hashCode(): int
     public static method hashCode-impl(p0: int, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String
@@ -310,7 +310,7 @@ public final class PublicPublic {
     public method equals(@org.jetbrains.annotations.Nullable p0: java.lang.Object): boolean
     public static method equals-impl(p0: int, p1: int, p2: java.lang.Object): boolean
     public final static method equals-impl0(p0: int, p1: int, p2: int, p3: int): boolean
-    public final static @org.jetbrains.annotations.NotNull method getValue-impl(p0: int, p1: int): Public
+    public final @org.jetbrains.annotations.NotNull method getValue(): Public
     public method hashCode(): int
     public static method hashCode-impl(p0: int, p1: int): int
     public @org.jetbrains.annotations.NotNull method toString(): java.lang.String