[IR] Support user-defined equals for MFVC

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

#KT-1179

compiler/testData/diagnostics/tests/inlineClasses/inefficientEqualsOverridingInInlineClass.kt

@@ -1,11 +1,11 @@
 // FIR_IDENTICAL
 // WITH_STDLIB
 // !DIAGNOSTICS: -DEBUG_INFO_SMARTCAST
-// LANGUAGE: +CustomEqualsInInlineClasses
+// LANGUAGE: +CustomEqualsInValueClasses
 
 @JvmInline
 value class IC1(val x: Int) {
-    override fun <!INEFFICIENT_EQUALS_OVERRIDING_IN_INLINE_CLASS!>equals<!>(other: Any?): Boolean {
+    override fun <!INEFFICIENT_EQUALS_OVERRIDING_IN_VALUE_CLASS!>equals<!>(other: Any?): Boolean {
         if (other !is IC1) {
             return false
         }
@@ -29,9 +29,9 @@ value class IC3(val x: Int) {
 
 @JvmInline
 value class IC4<T>(val x: Int) {
-    override fun <!INEFFICIENT_EQUALS_OVERRIDING_IN_INLINE_CLASS!>equals<!>(other: Any?) = true
+    override fun equals(other: Any?) = true
 
-    fun equals(other: IC4<T>) = true
+    fun equals(other: <!TYPE_ARGUMENT_ON_TYPED_VALUE_CLASS_EQUALS!>IC4<T><!>) = true
 
     override fun hashCode() = 0
-}
+}

compiler/testData/diagnostics/tests/inlineClasses/reservedMembersAndConstructsInsideInlineClass.kt

@@ -1,18 +1,21 @@
-// !LANGUAGE: +InlineClasses, -JvmInlineValueClasses, +CustomEqualsInInlineClasses
+// WITH_STDLIB
+// !LANGUAGE: +CustomEqualsInValueClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-inline class IC1(val x: Any) {
+@JvmInline
+value class IC1(val x: Any) {
     fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>box<!>() {}
     fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>box<!>(x: Any) {}
 
     fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>unbox<!>() {}
     fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>unbox<!>(x: Any) {}
 
-    override fun <!INEFFICIENT_EQUALS_OVERRIDING_IN_INLINE_CLASS!>equals<!>(other: Any?): Boolean = true
+    override fun <!INEFFICIENT_EQUALS_OVERRIDING_IN_VALUE_CLASS!>equals<!>(other: Any?): Boolean = true
     override fun hashCode(): Int = 0
 }
 
-inline class IC2(val x: Any) {
+@JvmInline
+value class IC2(val x: Any) {
     fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>box<!>(x: Any) {}
     fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>box<!>(): Any = TODO()
 
@@ -23,7 +26,8 @@ inline class IC2(val x: Any) {
     fun hashCode(a: Any): Int = 0
 }
 
-inline class IC3(val x: Any) {
+@JvmInline
+value class IC3(val x: Any) {
     fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>box<!>(x: Any): Any = TODO()
     fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>unbox<!>(x: Any): Any = TODO()
 
@@ -34,12 +38,34 @@ interface WithBox {
     fun box(): String
 }
 
-inline class IC4(val s: String) : WithBox {
+@JvmInline
+value class IC4(val s: String) : WithBox {
     override fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>box<!>(): String = ""
 }
 
-inline class IC5(val a: String) {
+@JvmInline
+value class IC5(val a: String) {
     constructor(i: Int) : this(i.toString()) <!SECONDARY_CONSTRUCTOR_WITH_BODY_INSIDE_VALUE_CLASS!>{<!>
         TODO("something")
     }
-}
+}
+
+@JvmInline
+value class IC6(val a: String) {
+    fun <!TYPE_PARAMETERS_NOT_ALLOWED!><T><!> equals(other: IC6): Boolean = true
+}
+
+@JvmInline
+value class IC7<T>(val a: String) {
+    fun equals(other: IC7<*>): Boolean = true
+}
+
+@JvmInline
+value class IC8<T>(val a: String) {
+    fun equals(other: <!TYPE_ARGUMENT_ON_TYPED_VALUE_CLASS_EQUALS!>IC8<T><!>): Boolean = true
+}
+
+@JvmInline
+value class IC9<T>(val a: String) {
+    fun equals(other: <!TYPE_ARGUMENT_ON_TYPED_VALUE_CLASS_EQUALS!>IC9<String><!>): Boolean = true
+}

compiler/testData/diagnostics/tests/inlineClasses/reservedMembersAndConstructsInsideInlineClass.txt

@@ -1,6 +1,6 @@
 package
 
-public final inline class IC1 {
+@kotlin.jvm.JvmInline public final value class IC1 {
     public constructor IC1(/*0*/ x: kotlin.Any)
     public final val x: kotlin.Any
     public final fun box(): kotlin.Unit
@@ -12,7 +12,7 @@ public final inline class IC1 {
     public final fun unbox(/*0*/ x: kotlin.Any): kotlin.Unit
 }
 
-public final inline class IC2 {
+@kotlin.jvm.JvmInline public final value class IC2 {
     public constructor IC2(/*0*/ x: kotlin.Any)
     public final val x: kotlin.Any
     public final fun box(): kotlin.Any
@@ -26,7 +26,7 @@ public final inline class IC2 {
     public final fun unbox(/*0*/ x: kotlin.Any): kotlin.Unit
 }
 
-public final inline class IC3 {
+@kotlin.jvm.JvmInline public final value class IC3 {
     public constructor IC3(/*0*/ x: kotlin.Any)
     public final val x: kotlin.Any
     public final fun box(/*0*/ x: kotlin.Any): kotlin.Any
@@ -37,7 +37,7 @@ public final inline class IC3 {
     public final fun unbox(/*0*/ x: kotlin.Any): kotlin.Any
 }
 
-public final inline class IC4 : WithBox {
+@kotlin.jvm.JvmInline public final value class IC4 : WithBox {
     public constructor IC4(/*0*/ s: kotlin.String)
     public final val s: kotlin.String
     public open override /*1*/ fun box(): kotlin.String
@@ -46,7 +46,7 @@ public final inline class IC4 : WithBox {
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
-public final inline class IC5 {
+@kotlin.jvm.JvmInline public final value class IC5 {
     public constructor IC5(/*0*/ i: kotlin.Int)
     public constructor IC5(/*0*/ a: kotlin.String)
     public final val a: kotlin.String
@@ -55,9 +55,46 @@ public final inline class IC5 {
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
 
+@kotlin.jvm.JvmInline public final value class IC6 {
+    public constructor IC6(/*0*/ a: kotlin.String)
+    public final val a: kotlin.String
+    public final fun </*0*/ T> equals(/*0*/ other: IC6): kotlin.Boolean
+    public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
+}
+
+@kotlin.jvm.JvmInline public final value class IC7</*0*/ T> {
+    public constructor IC7</*0*/ T>(/*0*/ a: kotlin.String)
+    public final val a: kotlin.String
+    public final fun equals(/*0*/ other: IC7<*>): kotlin.Boolean
+    public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
+}
+
+@kotlin.jvm.JvmInline public final value class IC8</*0*/ T> {
+    public constructor IC8</*0*/ T>(/*0*/ a: kotlin.String)
+    public final val a: kotlin.String
+    public final fun equals(/*0*/ other: IC8<T>): kotlin.Boolean
+    public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
+}
+
+@kotlin.jvm.JvmInline public final value class IC9</*0*/ T> {
+    public constructor IC9</*0*/ T>(/*0*/ a: kotlin.String)
+    public final val a: kotlin.String
+    public final fun equals(/*0*/ other: IC9<kotlin.String>): kotlin.Boolean
+    public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
+}
+
 public interface WithBox {
     public abstract fun box(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+

compiler/testData/diagnostics/tests/inlineClasses/typedEqualsOperatorDeclarationCheck.kt

@@ -1,7 +1,7 @@
 // FIR_IDENTICAL
 // WITH_STDLIB
 // !DIAGNOSTICS: -DEBUG_INFO_SMARTCAST
-// LANGUAGE: +CustomEqualsInInlineClasses
+// LANGUAGE: +CustomEqualsInValueClasses
 
 
 @JvmInline
@@ -23,12 +23,12 @@ value class IC2(val x: Int) {
 
 @JvmInline
 value class IC3<T>(val x: T) {
-    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun equals(other: IC3<T>) = true
+    operator fun equals(other: <!TYPE_ARGUMENT_ON_TYPED_VALUE_CLASS_EQUALS!>IC3<T><!>) = true
 }
 
 @JvmInline
 value class IC4<T>(val x: T) {
-    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun equals(other: IC4<String>) = true
+    operator fun equals(other: <!TYPE_ARGUMENT_ON_TYPED_VALUE_CLASS_EQUALS!>IC4<String><!>) = true
 }
 
 @JvmInline
@@ -49,4 +49,4 @@ value class IC7<T, R>(val x: T) {
 @JvmInline
 value class IC8<T, R>(val x: T) {
     operator fun equals(other: IC8<*, *>): Nothing = TODO()
-}
+}

compiler/testData/diagnostics/tests/inlineClasses/typedEqualsOperatorModifierInInlineClass.kt

@@ -0,0 +1,23 @@
+// FIR_IDENTICAL
+// WITH_STDLIB
+// !DIAGNOSTICS: -DEBUG_INFO_SMARTCAST
+// LANGUAGE: +CustomEqualsInValueClasses
+// SKIP_TXT
+
+
+@JvmInline
+value class IC1(val x: Int) {
+    override fun equals(other: Any?) = true
+
+    operator fun equals(other: IC1) = true
+
+    override fun hashCode() = 0
+}
+
+@JvmInline
+value class IC2(val x: Int) {
+    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun equals(other: IC1) = true
+
+    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun equals(other: IC2) {
+    }
+}

compiler/testData/diagnostics/tests/valueClasses/inefficientEqualsOverridingInMfvc.kt

@@ -0,0 +1,28 @@
+// FIR_IDENTICAL
+// WITH_STDLIB
+// !DIAGNOSTICS: -DEBUG_INFO_SMARTCAST
+// LANGUAGE: +CustomEqualsInValueClasses +ValueClasses
+
+@JvmInline
+value class MFVC1(val x: Int, val y: Int) {
+    override fun <!INEFFICIENT_EQUALS_OVERRIDING_IN_VALUE_CLASS!>equals<!>(other: Any?): Boolean {
+        if (other !is MFVC1) {
+            return false
+        }
+        return x == other.x
+    }
+}
+
+@JvmInline
+value class MFVC2(val x: Int, val y: Int) {
+    override fun hashCode() = 0
+}
+
+@JvmInline
+value class MFVC3(val x: Int, val y: Int) {
+    override fun equals(other: Any?) = true
+
+    fun equals(other: MFVC3) = true
+
+    override fun hashCode() = 0
+}

compiler/testData/diagnostics/tests/valueClasses/inefficientEqualsOverridingInMfvc.txt

@@ -0,0 +1,29 @@
+package
+
+@kotlin.jvm.JvmInline public final value class MFVC1 {
+    public constructor MFVC1(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Int)
+    public final val x: kotlin.Int
+    public final val y: kotlin.Int
+    public open override /*1*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
+}
+
+@kotlin.jvm.JvmInline public final value class MFVC2 {
+    public constructor MFVC2(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Int)
+    public final val x: kotlin.Int
+    public final val y: kotlin.Int
+    public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
+}
+
+@kotlin.jvm.JvmInline public final value class MFVC3 {
+    public constructor MFVC3(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Int)
+    public final val x: kotlin.Int
+    public final val y: kotlin.Int
+    public final fun equals(/*0*/ other: MFVC3): kotlin.Boolean
+    public open override /*1*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
+}

compiler/testData/diagnostics/tests/valueClasses/reservedMembersAndConstructsInsideMfvc.kt

@@ -1,5 +1,5 @@
 // !SKIP_JAVAC
-// !LANGUAGE: +CustomEqualsInInlineClasses, +ValueClasses
+// !LANGUAGE: +CustomEqualsInValueClasses, +ValueClasses
 // ALLOW_KOTLIN_PACKAGE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
@@ -102,4 +102,24 @@ value class MFVC5(val a: String, val b: String) {
     constructor(i: Int) : this(i.toString(), "6") <!SECONDARY_CONSTRUCTOR_WITH_BODY_INSIDE_VALUE_CLASS!>{<!>
         TODO("something")
     }
-}
+}
+
+@JvmInline
+value class MFVC6(val a: String, val b: String) {
+    fun <!TYPE_PARAMETERS_NOT_ALLOWED!><T><!> equals(other: MFVC6): Boolean = true
+}
+
+@JvmInline
+value class MFVC7<T>(val a: String, val b: String) {
+    fun equals(other: MFVC7<*>): Boolean = true
+}
+
+@JvmInline
+value class MFVC8<T>(val a: String, val b: String) {
+    fun equals(other: <!TYPE_ARGUMENT_ON_TYPED_VALUE_CLASS_EQUALS!>MFVC8<T><!>): Boolean = true
+}
+
+@JvmInline
+value class MFVC9<T>(val a: String, val b: String) {
+    fun equals(other: <!TYPE_ARGUMENT_ON_TYPED_VALUE_CLASS_EQUALS!>MFVC9<String><!>): Boolean = true
+}

compiler/testData/diagnostics/tests/valueClasses/reservedMembersAndConstructsInsideMfvc.txt

@@ -0,0 +1,186 @@
+package
+
+package kotlin {
+
+    package kotlin.jvm {
+
+        @kotlin.jvm.JvmInline public final value class IC1 {
+            public constructor IC1(/*0*/ x: kotlin.Any)
+            public final val x: kotlin.Any
+            public final fun box(): kotlin.Unit
+            public final fun box(/*0*/ x: kotlin.Any): kotlin.Unit
+            public open override /*1*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
+            public final fun unbox(): kotlin.Unit
+            public final fun unbox(/*0*/ x: kotlin.Any): kotlin.Unit
+        }
+
+        @kotlin.jvm.JvmInline public final value class IC2 {
+            public constructor IC2(/*0*/ x: kotlin.Any)
+            public final val x: kotlin.Any
+            public final fun box(): kotlin.Any
+            public final fun box(/*0*/ x: kotlin.Any): kotlin.Unit
+            public final fun equals(/*0*/ my: kotlin.Any, /*1*/ other: kotlin.Any): kotlin.Boolean
+            public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
+            public final fun hashCode(/*0*/ a: kotlin.Any): kotlin.Int
+            public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
+            public final fun unbox(): kotlin.Any
+            public final fun unbox(/*0*/ x: kotlin.Any): kotlin.Unit
+        }
+
+        @kotlin.jvm.JvmInline public final value class IC3 {
+            public constructor IC3(/*0*/ x: kotlin.Any)
+            public final val x: kotlin.Any
+            public final fun box(/*0*/ x: kotlin.Any): kotlin.Any
+            public final fun equals(): kotlin.Boolean
+            public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
+            public final fun unbox(/*0*/ x: kotlin.Any): kotlin.Any
+        }
+
+        @kotlin.jvm.JvmInline public final value class IC4 : kotlin.jvm.WithBox {
+            public constructor IC4(/*0*/ s: kotlin.String)
+            public final val s: kotlin.String
+            public open override /*1*/ fun box(): kotlin.String
+            public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
+        }
+
+        @kotlin.jvm.JvmInline public final value class IC5 {
+            public constructor IC5(/*0*/ i: kotlin.Int)
+            public constructor IC5(/*0*/ a: kotlin.String)
+            public final val a: kotlin.String
+            public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
+        }
+
+        @kotlin.jvm.JvmInline public final value class IC6 {
+            public constructor IC6(/*0*/ a: kotlin.String)
+            public final val a: kotlin.String
+            public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final fun </*0*/ T> equals(/*0*/ other: kotlin.jvm.IC6): kotlin.Boolean
+            public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
+        }
+
+        public final annotation class JvmInline : kotlin.Annotation {
+            public constructor JvmInline()
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+
+        @kotlin.jvm.JvmInline public final value class MFVC1 {
+            public constructor MFVC1(/*0*/ x: kotlin.Any, /*1*/ y: kotlin.Any)
+            public final val x: kotlin.Any
+            public final val y: kotlin.Any
+            public final fun box(): kotlin.Unit
+            public final fun box(/*0*/ x: kotlin.Any): kotlin.Unit
+            public open override /*1*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
+            public final fun unbox(): kotlin.Unit
+            public final fun unbox(/*0*/ x: kotlin.Any): kotlin.Unit
+        }
+
+        @kotlin.jvm.JvmInline public final value class MFVC2 {
+            public constructor MFVC2(/*0*/ x: kotlin.Any, /*1*/ y: kotlin.Any)
+            public final val x: kotlin.Any
+            public final val y: kotlin.Any
+            public final fun box(): kotlin.Any
+            public final fun box(/*0*/ x: kotlin.Any): kotlin.Unit
+            public final fun equals(/*0*/ my: kotlin.Any, /*1*/ other: kotlin.Any): kotlin.Boolean
+            public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
+            public final fun hashCode(/*0*/ a: kotlin.Any): kotlin.Int
+            public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
+            public final fun unbox(): kotlin.Any
+            public final fun unbox(/*0*/ x: kotlin.Any): kotlin.Unit
+        }
+
+        @kotlin.jvm.JvmInline public final value class MFVC3 {
+            public constructor MFVC3(/*0*/ x: kotlin.Any, /*1*/ y: kotlin.Any)
+            public final val x: kotlin.Any
+            public final val y: kotlin.Any
+            public final fun box(/*0*/ x: kotlin.Any): kotlin.Any
+            public final fun equals(): kotlin.Boolean
+            public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
+            public final fun unbox(/*0*/ x: kotlin.Any): kotlin.Any
+        }
+
+        @kotlin.jvm.JvmInline public final value class MFVC4 : kotlin.jvm.WithBox {
+            public constructor MFVC4(/*0*/ s: kotlin.String, /*1*/ t: kotlin.String)
+            public final val s: kotlin.String
+            public final val t: kotlin.String
+            public open override /*1*/ fun box(): kotlin.String
+            public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
+        }
+
+        @kotlin.jvm.JvmInline public final value class MFVC5 {
+            public constructor MFVC5(/*0*/ i: kotlin.Int)
+            public constructor MFVC5(/*0*/ a: kotlin.String, /*1*/ b: kotlin.String)
+            public final val a: kotlin.String
+            public final val b: kotlin.String
+            public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
+        }
+
+        @kotlin.jvm.JvmInline public final value class MFVC6 {
+            public constructor MFVC6(/*0*/ a: kotlin.String, /*1*/ b: kotlin.String)
+            public final val a: kotlin.String
+            public final val b: kotlin.String
+            public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final fun </*0*/ T> equals(/*0*/ other: kotlin.jvm.MFVC6): kotlin.Boolean
+            public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
+        }
+
+        @kotlin.jvm.JvmInline public final value class MFVC7</*0*/ T> {
+            public constructor MFVC7</*0*/ T>(/*0*/ a: kotlin.String, /*1*/ b: kotlin.String)
+            public final val a: kotlin.String
+            public final val b: kotlin.String
+            public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final fun equals(/*0*/ other: kotlin.jvm.MFVC7<*>): kotlin.Boolean
+            public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
+        }
+
+        @kotlin.jvm.JvmInline public final value class MFVC8</*0*/ T> {
+            public constructor MFVC8</*0*/ T>(/*0*/ a: kotlin.String, /*1*/ b: kotlin.String)
+            public final val a: kotlin.String
+            public final val b: kotlin.String
+            public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final fun equals(/*0*/ other: kotlin.jvm.MFVC8<T>): kotlin.Boolean
+            public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
+        }
+
+        @kotlin.jvm.JvmInline public final value class MFVC9</*0*/ T> {
+            public constructor MFVC9</*0*/ T>(/*0*/ a: kotlin.String, /*1*/ b: kotlin.String)
+            public final val a: kotlin.String
+            public final val b: kotlin.String
+            public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final fun equals(/*0*/ other: kotlin.jvm.MFVC9<kotlin.String>): kotlin.Boolean
+            public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
+        }
+
+        public interface WithBox {
+            public abstract fun box(): kotlin.String
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+}
+

compiler/testData/diagnostics/tests/valueClasses/reservedMembersAndConstructsInsideValueClass.kt

@@ -1,57 +0,0 @@
-// FIR_IDENTICAL
-// !SKIP_JAVAC
-// !LANGUAGE: +InlineClasses, +CustomEqualsInInlineClasses
-// ALLOW_KOTLIN_PACKAGE
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-
-package kotlin.jvm
-
-annotation class JvmInline
-
-@JvmInline
-value class IC1(val x: Any) {
-    fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>box<!>() {}
-    fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>box<!>(x: Any) {}
-
-    fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>unbox<!>() {}
-    fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>unbox<!>(x: Any) {}
-
-    override fun <!INEFFICIENT_EQUALS_OVERRIDING_IN_INLINE_CLASS!>equals<!>(other: Any?): Boolean = true
-    override fun hashCode(): Int = 0
-}
-
-@JvmInline
-value class IC2(val x: Any) {
-    fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>box<!>(x: Any) {}
-    fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>box<!>(): Any = TODO()
-
-    fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>unbox<!>(x: Any) {}
-    fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>unbox<!>(): Any = TODO()
-
-    fun equals(my: Any, other: Any): Boolean = true
-    fun hashCode(a: Any): Int = 0
-}
-
-@JvmInline
-value class IC3(val x: Any) {
-    fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>box<!>(x: Any): Any = TODO()
-    fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>unbox<!>(x: Any): Any = TODO()
-
-    fun equals(): Boolean = true
-}
-
-interface WithBox {
-    fun box(): String
-}
-
-@JvmInline
-value class IC4(val s: String) : WithBox {
-    override fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>box<!>(): String = ""
-}
-
-@JvmInline
-value class IC5(val a: String) {
-    constructor(i: Int) : this(i.toString()) {
-        TODO("something")
-    }
-}

compiler/testData/diagnostics/tests/valueClasses/reservedMembersAndConstructsInsideValueClass.txt

@@ -1,76 +0,0 @@
-package
-
-package kotlin {
-
-    package kotlin.jvm {
-
-        @kotlin.jvm.JvmInline public final value class IC1 {
-            public constructor IC1(/*0*/ x: kotlin.Any)
-            public final val x: kotlin.Any
-            public final fun box(): kotlin.Unit
-            public final fun box(/*0*/ x: kotlin.Any): kotlin.Unit
-            public open override /*1*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public open override /*1*/ fun hashCode(): kotlin.Int
-            public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
-            public final fun unbox(): kotlin.Unit
-            public final fun unbox(/*0*/ x: kotlin.Any): kotlin.Unit
-        }
-
-        @kotlin.jvm.JvmInline public final value class IC2 {
-            public constructor IC2(/*0*/ x: kotlin.Any)
-            public final val x: kotlin.Any
-            public final fun box(): kotlin.Any
-            public final fun box(/*0*/ x: kotlin.Any): kotlin.Unit
-            public final fun equals(/*0*/ my: kotlin.Any, /*1*/ other: kotlin.Any): kotlin.Boolean
-            public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
-            public final fun hashCode(/*0*/ a: kotlin.Any): kotlin.Int
-            public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
-            public final fun unbox(): kotlin.Any
-            public final fun unbox(/*0*/ x: kotlin.Any): kotlin.Unit
-        }
-
-        @kotlin.jvm.JvmInline public final value class IC3 {
-            public constructor IC3(/*0*/ x: kotlin.Any)
-            public final val x: kotlin.Any
-            public final fun box(/*0*/ x: kotlin.Any): kotlin.Any
-            public final fun equals(): kotlin.Boolean
-            public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
-            public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
-            public final fun unbox(/*0*/ x: kotlin.Any): kotlin.Any
-        }
-
-        @kotlin.jvm.JvmInline public final value class IC4 : kotlin.jvm.WithBox {
-            public constructor IC4(/*0*/ s: kotlin.String)
-            public final val s: kotlin.String
-            public open override /*1*/ fun box(): kotlin.String
-            public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
-            public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
-        }
-
-        @kotlin.jvm.JvmInline public final value class IC5 {
-            public constructor IC5(/*0*/ i: kotlin.Int)
-            public constructor IC5(/*0*/ a: kotlin.String)
-            public final val a: kotlin.String
-            public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
-            public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
-        }
-
-        public final annotation class JvmInline : kotlin.Annotation {
-            public constructor JvmInline()
-            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
-
-        public interface WithBox {
-            public abstract fun box(): kotlin.String
-            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
-    }
-}

compiler/testData/diagnostics/tests/valueClasses/typedEqualsOperatorModifierInMfvc.kt

@@ -0,0 +1,22 @@
+// FIR_IDENTICAL
+// WITH_STDLIB
+// !DIAGNOSTICS: -DEBUG_INFO_SMARTCAST
+// LANGUAGE: +CustomEqualsInValueClasses, +ValueClasses
+
+
+@JvmInline
+value class MFVC1(val x: Int, val y: Int) {
+    override fun equals(other: Any?) = true
+
+    operator fun equals(other: MFVC1) = true
+
+    override fun hashCode() = 0
+}
+
+@JvmInline
+value class MFVC2(val x: Int, val y: Int) {
+    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun equals(other: MFVC1) = true
+
+    <!INAPPLICABLE_OPERATOR_MODIFIER!>operator<!> fun equals(other: MFVC2) {
+    }
+}

compiler/testData/diagnostics/tests/valueClasses/typedEqualsOperatorModifierInMfvc.txt

@@ -0,0 +1,22 @@
+package
+
+@kotlin.jvm.JvmInline public final value class MFVC1 {
+    public constructor MFVC1(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Int)
+    public final val x: kotlin.Int
+    public final val y: kotlin.Int
+    public final operator fun equals(/*0*/ other: MFVC1): kotlin.Boolean
+    public open override /*1*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
+}
+
+@kotlin.jvm.JvmInline public final value class MFVC2 {
+    public constructor MFVC2(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Int)
+    public final val x: kotlin.Int
+    public final val y: kotlin.Int
+    public final operator fun equals(/*0*/ other: MFVC1): kotlin.Boolean
+    public final operator fun equals(/*0*/ other: MFVC2): kotlin.Unit
+    public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
+}