KT-MR-7307 review fixes

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnostics.kt

@@ -2704,7 +2704,7 @@ sealed class KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
         override val diagnosticClass get() = RedundantInlineSuspendFunctionType::class
     }
 
-    abstract class InefficientEqualsOverridingInInlineClass : KtFirDiagnostic<KtDeclaration>() {
+    abstract class InefficientEqualsOverridingInInlineClass : KtFirDiagnostic<KtNamedFunction>() {
         override val diagnosticClass get() = InefficientEqualsOverridingInInlineClass::class
         abstract val className: String
     }

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnosticsImpl.kt

@@ -3265,7 +3265,7 @@ internal class InefficientEqualsOverridingInInlineClassImpl(
     override val className: String,
     override val firDiagnostic: KtPsiDiagnostic,
     override val token: KtLifetimeToken,
-) : KtFirDiagnostic.InefficientEqualsOverridingInInlineClass(), KtAbstractFirDiagnostic<KtDeclaration>
+) : KtFirDiagnostic.InefficientEqualsOverridingInInlineClass(), KtAbstractFirDiagnostic<KtNamedFunction>
 
 internal class CannotAllUnderImportFromSingletonImpl(
     override val objectName: Name,

analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java

@@ -17855,9 +17855,9 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
             }
 
             @Test
-            @TestMetadata("illegalEqualsOverridingInInlineClass.kt")
+            @TestMetadata("inefficientEqualsOverridingInInlineClass.kt")
-            public void testIllegalEqualsOverridingInInlineClass() throws Exception {
+            public void testInefficientEqualsOverridingInInlineClass() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/inlineClasses/illegalEqualsOverridingInInlineClass.kt");
+                runTest("compiler/testData/diagnostics/tests/inlineClasses/inefficientEqualsOverridingInInlineClass.kt");
             }
 
             @Test

compiler/fir/analysis-tests/testData/resolve/inlineClasses/inlineClassMembers.kt

@@ -18,7 +18,7 @@ inline class ReversedMembers(val x: Int) {
     fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>box<!>() {}
     fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>unbox<!>() {}
 
-    <!INEFFICIENT_EQUALS_OVERRIDING_IN_INLINE_CLASS!>override fun equals(other: Any?)<!> = true
+    override fun <!INEFFICIENT_EQUALS_OVERRIDING_IN_INLINE_CLASS!>equals<!>(other: Any?) = true
     override fun hashCode() = 1
 }
 

compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java

@@ -17855,9 +17855,9 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
             }
 
             @Test
-            @TestMetadata("illegalEqualsOverridingInInlineClass.kt")
+            @TestMetadata("inefficientEqualsOverridingInInlineClass.kt")
-            public void testIllegalEqualsOverridingInInlineClass() throws Exception {
+            public void testInefficientEqualsOverridingInInlineClass() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/inlineClasses/illegalEqualsOverridingInInlineClass.kt");
+                runTest("compiler/testData/diagnostics/tests/inlineClasses/inefficientEqualsOverridingInInlineClass.kt");
             }
 
             @Test

compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java

@@ -17855,9 +17855,9 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
             }
 
             @Test
-            @TestMetadata("illegalEqualsOverridingInInlineClass.kt")
+            @TestMetadata("inefficientEqualsOverridingInInlineClass.kt")
-            public void testIllegalEqualsOverridingInInlineClass() throws Exception {
+            public void testInefficientEqualsOverridingInInlineClass() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/inlineClasses/illegalEqualsOverridingInInlineClass.kt");
+                runTest("compiler/testData/diagnostics/tests/inlineClasses/inefficientEqualsOverridingInInlineClass.kt");
             }
 
             @Test

compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt

@@ -1398,7 +1398,7 @@ object DIAGNOSTICS_LIST : DiagnosticList("FirErrors") {
 
         val REDUNDANT_INLINE_SUSPEND_FUNCTION_TYPE by warning<KtElement>(PositioningStrategy.SUSPEND_MODIFIER)
 
-        val INEFFICIENT_EQUALS_OVERRIDING_IN_INLINE_CLASS by warning<KtDeclaration>(PositioningStrategy.DECLARATION_SIGNATURE) {
+        val INEFFICIENT_EQUALS_OVERRIDING_IN_INLINE_CLASS by warning<KtNamedFunction>(PositioningStrategy.DECLARATION_NAME) {
             parameter<String>("className")
         }
     }

compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt

@@ -723,7 +723,7 @@ object FirErrors {
     val ILLEGAL_INLINE_PARAMETER_MODIFIER by error0<KtElement>(SourceElementPositioningStrategies.INLINE_PARAMETER_MODIFIER)
     val INLINE_SUSPEND_FUNCTION_TYPE_UNSUPPORTED by error0<KtParameter>()
     val REDUNDANT_INLINE_SUSPEND_FUNCTION_TYPE by warning0<KtElement>(SourceElementPositioningStrategies.SUSPEND_MODIFIER)
-    val INEFFICIENT_EQUALS_OVERRIDING_IN_INLINE_CLASS by warning1<KtDeclaration, String>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE)
+    val INEFFICIENT_EQUALS_OVERRIDING_IN_INLINE_CLASS by warning1<KtNamedFunction, String>(SourceElementPositioningStrategies.DECLARATION_NAME)
 
     // Imports
     val CANNOT_ALL_UNDER_IMPORT_FROM_SINGLETON by error1<KtImportDirective, Name>(SourceElementPositioningStrategies.IMPORT_LAST_NAME)

compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirInlineClassDeclarationChecker.kt

@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.declarations.utils.*
 import org.jetbrains.kotlin.fir.expressions.toResolvedCallableSymbol
 import org.jetbrains.kotlin.fir.resolve.fullyExpandedType
+import org.jetbrains.kotlin.fir.resolve.isEquals
 import org.jetbrains.kotlin.fir.resolve.lookupSuperTypes
 import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirValueParameterSymbol
@@ -204,16 +205,22 @@ object FirInlineClassDeclarationChecker : FirRegularClassChecker() {
         }
 
         if (context.languageVersionSettings.supportsFeature(LanguageFeature.CustomEqualsInInlineClasses)) {
-            val simpleFunctions = declaration.declarations.filterIsInstance<FirSimpleFunction>()
+            var equalsFromAnyOverriding: FirSimpleFunction? = null
-            simpleFunctions.singleOrNull() { it.overridesEqualsFromAny() }?.apply {
+            var typedEqualsIsDefined = false
-                if (declaration.symbol.isInline && simpleFunctions.none { it.isTypedEqualsInInlineClass(context.session) }) {
+            declaration.declarations.forEach {
-                    reporter.reportOn(
+                if (it !is FirSimpleFunction) {
-                        source,
+                    return@forEach
-                        FirErrors.INEFFICIENT_EQUALS_OVERRIDING_IN_INLINE_CLASS,
-                        declaration.name.asString(),
-                        context
-                    )
                 }
+                if (it.isEquals()) equalsFromAnyOverriding = it
+                if (it.isTypedEqualsInInlineClass(context.session)) typedEqualsIsDefined = true
+            }
+            if (equalsFromAnyOverriding != null && !typedEqualsIsDefined) {
+                reporter.reportOn(
+                    equalsFromAnyOverriding!!.source,
+                    FirErrors.INEFFICIENT_EQUALS_OVERRIDING_IN_INLINE_CLASS,
+                    declaration.name.asString(),
+                    context
+                )
             }
         }
     }

compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/declarationUtils.kt

@@ -121,17 +121,10 @@ fun FirClassSymbol<*>.primaryConstructorSymbol(): FirConstructorSymbol? {
 
 fun FirSimpleFunction.isTypedEqualsInInlineClass(session: FirSession): Boolean =
     containingClass()?.toFirRegularClassSymbol(session)?.run {
-        this@isTypedEqualsInInlineClass.contextReceivers.isEmpty()
+        with(this@isTypedEqualsInInlineClass) {
-                && this@isTypedEqualsInInlineClass.receiverTypeRef == null
+            contextReceivers.isEmpty() && receiverTypeRef == null && name == OperatorNameConventions.EQUALS
-                && this@isTypedEqualsInInlineClass.name == OperatorNameConventions.EQUALS
+                    && this@run.isInline && valueParameters.size == 1 && returnTypeRef.isBoolean
-                && this@isTypedEqualsInInlineClass.returnTypeRef.isBoolean
+                    && valueParameters[0].returnTypeRef.coneType.classId == this@run.classId
-                && isInline
+        }
-                && this@isTypedEqualsInInlineClass.valueParameters.size == 1
-                && this@isTypedEqualsInInlineClass.valueParameters[0].returnTypeRef.coneType.classId == classId
     } ?: false
 
-fun FirSimpleFunction.overridesEqualsFromAny(): Boolean {
-    return name == OperatorNameConventions.EQUALS && returnTypeRef.isBoolean
-            && valueParameters.size == 1 && valueParameters[0].returnTypeRef.isNullableAny
-            && contextReceivers.isEmpty() && receiverTypeRef == null
-}

compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java

@@ -21467,6 +21467,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/inlineClasses/inlineClassPropertyReferenceGetAndSetGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
         }
 
+        @Test
+        @TestMetadata("inlineClassTypedEqualsGenerics.kt")
+        public void testInlineClassTypedEqualsGenerics() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassTypedEqualsGenerics.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+        }
+
         @Test
         @TestMetadata("inlineClassUntypedEqualsOverriden.kt")
         public void testInlineClassUntypedEqualsOverriden() throws Exception {

compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/DeclarationUtils.kt

@@ -91,6 +91,8 @@ val FirConstructorSymbol.isTypeAliasedConstructor: Boolean
 fun FirSimpleFunction.isEquals(): Boolean {
     if (name != OperatorNameConventions.EQUALS) return false
     if (valueParameters.size != 1) return false
+    if (contextReceivers.isNotEmpty()) return false
+    if (receiverTypeRef != null) return false
     val parameter = valueParameters.first()
     return parameter.returnTypeRef.isNullableAny
 }

compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java

@@ -428,8 +428,8 @@ public interface Errors {
     DiagnosticFactory0<PsiElement> VALUE_CLASS_CANNOT_BE_CLONEABLE = DiagnosticFactory0.create(ERROR);
     DiagnosticFactory0<PsiElement> INLINE_CLASS_DEPRECATED = DiagnosticFactory0.create(WARNING);
     DiagnosticFactory0<KtContextReceiverList> INLINE_CLASS_CANNOT_HAVE_CONTEXT_RECEIVERS = DiagnosticFactory0.create(ERROR);
-    DiagnosticFactory1<KtDeclaration, String> INEFFICIENT_EQUALS_OVERRIDING_IN_INLINE_CLASS =
+    DiagnosticFactory1<KtNamedFunction, String> INEFFICIENT_EQUALS_OVERRIDING_IN_INLINE_CLASS =
-            DiagnosticFactory1.create(WARNING, DECLARATION_SIGNATURE);
+            DiagnosticFactory1.create(WARNING, DECLARATION_NAME);
 
     // Result class
 

compiler/testData/codegen/box/inlineClasses/inlineClassTypedEqualsGenerics.kt

@@ -0,0 +1,55 @@
+// WITH_STDLIB
+// WORKS_WHEN_VALUE_CLASS
+// LANGUAGE: +ValueClasses, +CustomEqualsInInlineClasses
+// TARGET_BACKEND: JVM_IR
+
+OPTIONAL_JVM_INLINE_ANNOTATION
+value class IC1<T : Number>(val x: T) {
+    fun equals(other: Int) = false
+    fun equals(other: IC1<T>) = true
+}
+
+class Generic<T, R>(val x: T, val y: R)
+
+OPTIONAL_JVM_INLINE_ANNOTATION
+value class IC2<T, R>(val value: Generic<T, R>) {
+    fun equals(other: IC1<Double>) = false
+    fun equals(other: IC2<T, R>) = true
+}
+
+OPTIONAL_JVM_INLINE_ANNOTATION
+value class IC3<T>(val value: T) {
+    fun equals(other: Int) = false
+    fun equals(other: IC3<*>) = true
+}
+
+OPTIONAL_JVM_INLINE_ANNOTATION
+value class IC4<T>(val value: T) {
+    fun equals(other: String) = false
+    fun equals(other: IC4<String>) = true
+}
+
+
+fun box() = when {
+    IC1(5.0) != IC1(3) -> "Fail 1.1"
+    (IC1(5.0) as Any) != IC1(3) -> "Fail 1.2"
+    IC1(5.0) != (IC1(3) as Any) -> "Fail 1.3"
+    (IC1(5.0) as Any) != (IC1(3) as Any) -> "Fail 1.4"
+
+    IC2(Generic("aba", 5.0)) != IC2(Generic(3, 8)) -> "Fail 2.1"
+    (IC2(Generic("aba", 5.0)) as Any) != IC2(Generic(3, 8)) -> "Fail 2.2"
+    IC2(Generic("aba", 5.0)) != (IC2(Generic(3, 8)) as Any) -> "Fail 2.3"
+    (IC2(Generic("aba", 5.0)) as Any) != (IC2(Generic(3, 8)) as Any) -> "Fail 2.4"
+
+    IC3("x") != IC3("y") -> "Fail 3.1"
+    (IC3("x") as Any) != IC3("y") -> "Fail 3.2"
+    IC3("x") != (IC3("y") as Any) -> "Fail 3.3"
+    (IC3("x") as Any) != (IC3("y") as Any) -> "Fail 3.4"
+
+    IC4("aba") != IC4("caba") -> "Fail 4.1"
+    (IC4("aba") as Any) != IC4("caba") -> "Fail 4.2"
+    IC4("aba") != (IC4("caba") as Any) -> "Fail 4.3"
+    (IC4("aba") as Any) != (IC4("caba") as Any) -> "Fail 4.4"
+
+    else -> "OK"
+}

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

@@ -5,7 +5,7 @@
 
 @JvmInline
 value class IC1(val x: Int) {
-    <!INEFFICIENT_EQUALS_OVERRIDING_IN_INLINE_CLASS!>override fun equals(other: Any?): Boolean<!> {
+    override fun <!INEFFICIENT_EQUALS_OVERRIDING_IN_INLINE_CLASS!>equals<!>(other: Any?): Boolean {
         if (other !is IC1) {
             return false
         }

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

@@ -8,7 +8,7 @@ inline class IC1(val x: Any) {
     fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>unbox<!>() {}
     fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>unbox<!>(x: Any) {}
 
-    <!INEFFICIENT_EQUALS_OVERRIDING_IN_INLINE_CLASS!>override fun equals(other: Any?): Boolean<!> = true
+    override fun <!INEFFICIENT_EQUALS_OVERRIDING_IN_INLINE_CLASS!>equals<!>(other: Any?): Boolean = true
     override fun hashCode(): Int = 0
 }
 

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

@@ -8,7 +8,7 @@ inline class IC1(val x: Any) {
     fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>unbox<!>() {}
     fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>unbox<!>(x: Any) {}
 
-    <!INEFFICIENT_EQUALS_OVERRIDING_IN_INLINE_CLASS!>override fun equals(other: Any?): Boolean<!> = true
+    override fun <!INEFFICIENT_EQUALS_OVERRIDING_IN_INLINE_CLASS!>equals<!>(other: Any?): Boolean = true
     override fun hashCode(): Int = 0
 }
 

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

@@ -15,7 +15,7 @@ value class IC1(val x: Any) {
     fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>unbox<!>() {}
     fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>unbox<!>(x: Any) {}
 
-    <!INEFFICIENT_EQUALS_OVERRIDING_IN_INLINE_CLASS!>override fun equals(other: Any?): Boolean<!> = true
+    override fun <!INEFFICIENT_EQUALS_OVERRIDING_IN_INLINE_CLASS!>equals<!>(other: Any?): Boolean = true
     override fun hashCode(): Int = 0
 }
 

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

@@ -15,7 +15,7 @@ value class IC1(val x: Any) {
     fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>unbox<!>() {}
     fun <!RESERVED_MEMBER_INSIDE_VALUE_CLASS!>unbox<!>(x: Any) {}
 
-    <!INEFFICIENT_EQUALS_OVERRIDING_IN_INLINE_CLASS!>override fun equals(other: Any?): Boolean<!> = true
+    override fun <!INEFFICIENT_EQUALS_OVERRIDING_IN_INLINE_CLASS!>equals<!>(other: Any?): Boolean = true
     override fun hashCode(): Int = 0
 }
 

compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java

@@ -17861,9 +17861,9 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
             }
 
             @Test
-            @TestMetadata("illegalEqualsOverridingInInlineClass.kt")
+            @TestMetadata("inefficientEqualsOverridingInInlineClass.kt")
-            public void testIllegalEqualsOverridingInInlineClass() throws Exception {
+            public void testInefficientEqualsOverridingInInlineClass() throws Exception {
-                runTest("compiler/testData/diagnostics/tests/inlineClasses/illegalEqualsOverridingInInlineClass.kt");
+                runTest("compiler/testData/diagnostics/tests/inlineClasses/inefficientEqualsOverridingInInlineClass.kt");
             }
 
             @Test

compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java

@@ -21467,6 +21467,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/inlineClasses/inlineClassPropertyReferenceGetAndSetGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
         }
 
+        @Test
+        @TestMetadata("inlineClassTypedEqualsGenerics.kt")
+        public void testInlineClassTypedEqualsGenerics() throws Exception {
+            runTest("compiler/testData/codegen/box/inlineClasses/inlineClassTypedEqualsGenerics.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
+        }
+
         @Test
         @TestMetadata("inlineClassUntypedEqualsOverriden.kt")
         public void testInlineClassUntypedEqualsOverriden() throws Exception {

compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt

@@ -284,7 +284,7 @@ enum class LanguageFeature(
     DataObjects(KOTLIN_1_9), // KT-4107
     ProhibitAccessToEnumCompanionMembersInEnumConstructorCall(KOTLIN_1_9, kind = BUG_FIX), // KT-49110
     ReferencesToSyntheticJavaProperties(KOTLIN_1_9), // KT-8575
-    CustomEqualsInInlineClasses(KOTLIN_1_9, kind = UNSTABLE_FEATURE), // KT-24874
+    CustomEqualsInInlineClasses(KOTLIN_1_9), // KT-24874
 
 
     // Disabled for indefinite time. See KT-53751

core/descriptors/src/org/jetbrains/kotlin/descriptors/descriptorUtil.kt

@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.incremental.components.LookupLocation
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.resolve.DescriptorUtils
+import org.jetbrains.kotlin.resolve.descriptorUtil.classId
 import org.jetbrains.kotlin.resolve.descriptorUtil.module
 import org.jetbrains.kotlin.resolve.isInlineClass
 import org.jetbrains.kotlin.types.KotlinType
@@ -93,13 +94,12 @@ fun DeclarationDescriptor.containingPackage(): FqName? {
 
 object DeserializedDeclarationsFromSupertypeConflictDataKey : CallableDescriptor.UserDataKey<CallableMemberDescriptor>
 
-fun FunctionDescriptor.isTypedEqualsInInlineClass(): Boolean = name == OperatorNameConventions.EQUALS
+fun FunctionDescriptor.isTypedEqualsInInlineClass() = name == OperatorNameConventions.EQUALS
         && (returnType?.isBoolean() ?: false) && containingDeclaration.isInlineClass()
-        && valueParameters.size == 1 && valueParameters[0].type == (containingDeclaration as? ClassDescriptor)?.defaultType
+        && valueParameters.size == 1 && valueParameters[0].type.constructor.declarationDescriptor.classId == (containingDeclaration as? ClassDescriptor)?.classId
         && contextReceiverParameters.isEmpty() && extensionReceiverParameter == null
 
 
 fun FunctionDescriptor.overridesEqualsFromAny(): Boolean = name == OperatorNameConventions.EQUALS
-        && (returnType?.isBoolean() ?: false)
         && valueParameters.size == 1 && valueParameters[0].type.isNullableAny()
         && contextReceiverParameters.isEmpty() && extensionReceiverParameter == null