[FIR] Also enhance declaration status with MustUse for Java methods converted to synthetic properties

#KT-80179 Fixed

Author: sandwwraith

compiler/fir/fir-jvm/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt

@@ -219,7 +219,7 @@ class FirSignatureEnhancement(
                     symbol = FirJavaOverriddenSyntheticPropertySymbol(propertySymbol.callableId, propertySymbol.getterId)
                     delegateGetter = enhancedGetterSymbol?.fir as FirSimpleFunction? ?: getterDelegate
                     delegateSetter = enhancedSetterSymbol?.fir as FirSimpleFunction? ?: setterDelegate
-                    customStatus = firElement.status
+                    customStatus = enhanceStatus(firElement.status, predefinedEnhancementInfo = null, overriddenMembers = overridden)
                     deprecationsProvider = getDeprecationsProviderFromAccessors(session, delegateGetter, delegateSetter)
                     dispatchReceiverType = firElement.dispatchReceiverType
                 }.symbol
@@ -409,7 +409,7 @@ class FirSignatureEnhancement(
                     origin = declarationOrigin
 
                     this.name = name!!
-                    status = enhanceStatus(firMethod, predefinedEnhancementInfo, overriddenMembers)
+                    status = enhanceStatus(firMethod.status, predefinedEnhancementInfo, overriddenMembers)
                     symbol = if (isIntersectionOverride) {
                         FirIntersectionOverrideFunctionSymbol(
                             methodId, overriddenMembers.map { it.symbol },
@@ -506,11 +506,10 @@ class FirSignatureEnhancement(
     }
 
     private fun enhanceStatus(
-        method: FirSimpleFunction,
+        original: FirDeclarationStatus,
         predefinedEnhancementInfo: PredefinedFunctionEnhancementInfo?,
         overriddenMembers: List<FirCallableDeclaration>,
     ): FirDeclarationStatus {
-        val original = method.status
         if (original.returnValueStatus != ReturnValueStatus.Unspecified) return original
         predefinedEnhancementInfo?.returnValueStatus?.takeIf { it != ReturnValueStatus.Unspecified }?.let { newRvStatus ->
             return original.copy(returnValueStatus = newRvStatus)

compiler/testData/diagnostics/tests/crv/collectionsAndJavaTypes.fir.kt

@@ -59,7 +59,7 @@ fun optional(s: String?) {
 
 fun stringBuilder(sb: StringBuilder, ss: CharSequence) {
     sb.append("")
-    sb.length // .length is not reported because of KT-80179
+    <!RETURN_VALUE_NOT_USED!>sb.length<!>
     <!RETURN_VALUE_NOT_USED!>sb.get(0)<!>
     <!RETURN_VALUE_NOT_USED!>ss.length<!>
     <!RETURN_VALUE_NOT_USED!>ss.get(0)<!>

compiler/testData/diagnostics/tests/crv/collectionsAndJavaTypes.kt

@@ -59,7 +59,7 @@ fun optional(s: String?) {
 
 fun stringBuilder(sb: StringBuilder, ss: CharSequence) {
     sb.append("")
-    sb.length // .length is not reported because of KT-80179
+    sb.length
     sb.get(0)
     ss.length
     ss.get(0)

compiler/testData/diagnostics/tests/crv/javaAnnotationsOverride.fir.kt

@@ -130,18 +130,18 @@ fun test2(l: List2) {
 }
 
 fun test3(l: List3) {
-    // Due to enhancements, UnnanotatedList.get gets @MURV from kotlin.collections.List.get
+    // Due to enhancements, UnnanotatedList.get/size get @MURV from kotlin.collections.List.get/size
     <!RETURN_VALUE_NOT_USED!>l.get(0)<!>
     l.notAListMember()
-    l.size
+    <!RETURN_VALUE_NOT_USED!>l.size<!>
     l.set(0, "")
     l.add("")
 }
 
 fun test4(l: List4) {
     <!RETURN_VALUE_NOT_USED!>l.get(0)<!>
     l.notAListMember()
-    l.size
+    <!RETURN_VALUE_NOT_USED!>l.size<!>
     l.set(0, "")
     <!RETURN_VALUE_NOT_USED!>l.add("")<!>
 }

compiler/testData/diagnostics/tests/crv/javaAnnotationsOverride.kt

@@ -130,7 +130,7 @@ fun test2(l: List2) {
 }
 
 fun test3(l: List3) {
-    // Due to enhancements, UnnanotatedList.get gets @MURV from kotlin.collections.List.get
+    // Due to enhancements, UnnanotatedList.get/size get @MURV from kotlin.collections.List.get/size
     l.get(0)
     l.notAListMember()
     l.size

compiler/testData/diagnostics/tests/crv/kotlinJavaKotlin.fir.kt

@@ -7,13 +7,15 @@
 interface KotlinBase {
     fun x(): String
     @IgnorableReturnValue fun ign(): String
+    val p: String
 }
 
 // FILE: JavaI1.java
 
 public interface JavaI1 extends KotlinBase {
     String x();
     String ign();
+    String getP();
 }
 
 // FILE: JavaI2.java
@@ -24,18 +26,21 @@ public interface JavaI2 extends KotlinBase {
     @IgnorableReturnValue
     String x();
     String ign();
+    String getP();
 }
 
 // FILE: KtFile.kt
 
 class K1: JavaI1 {
     override fun x() = ""
     override fun ign() = ""
+    override val p = ""
 }
 
 class K2: JavaI2 {
     override fun x() = ""
     override fun ign() = ""
+    override val p = ""
 }
 
 fun testX(b: KotlinBase, j1: JavaI1, j2: JavaI2, k1: K1, k2: K2) {
@@ -46,6 +51,14 @@ fun testX(b: KotlinBase, j1: JavaI1, j2: JavaI2, k1: K1, k2: K2) {
     k2.x()
 }
 
+fun testP(b: KotlinBase, j1: JavaI1, j2: JavaI2, k1: K1, k2: K2) {
+    <!RETURN_VALUE_NOT_USED!>b.p<!>
+    <!RETURN_VALUE_NOT_USED!>j1.p<!>
+    <!RETURN_VALUE_NOT_USED!>k1.p<!>
+    <!RETURN_VALUE_NOT_USED!>j2.p<!>
+    <!RETURN_VALUE_NOT_USED!>k2.p<!>
+}
+
 fun testIgn(b: KotlinBase, j1: JavaI1, j2: JavaI2, k1: K1, k2: K2) {
     b.ign()
     j1.ign()

compiler/testData/diagnostics/tests/crv/kotlinJavaKotlin.kt

@@ -7,13 +7,15 @@
 interface KotlinBase {
     fun x(): String
     @IgnorableReturnValue fun ign(): String
+    val p: String
 }
 
 // FILE: JavaI1.java
 
 public interface JavaI1 extends KotlinBase {
     String x();
     String ign();
+    String getP();
 }
 
 // FILE: JavaI2.java
@@ -24,18 +26,21 @@ public interface JavaI2 extends KotlinBase {
     @IgnorableReturnValue
     String x();
     String ign();
+    String getP();
 }
 
 // FILE: KtFile.kt
 
 class K1: JavaI1 {
     override fun x() = ""
     override fun ign() = ""
+    override val p = ""
 }
 
 class K2: JavaI2 {
     override fun x() = ""
     override fun ign() = ""
+    override val p = ""
 }
 
 fun testX(b: KotlinBase, j1: JavaI1, j2: JavaI2, k1: K1, k2: K2) {
@@ -46,6 +51,14 @@ fun testX(b: KotlinBase, j1: JavaI1, j2: JavaI2, k1: K1, k2: K2) {
     k2.x()
 }
 
+fun testP(b: KotlinBase, j1: JavaI1, j2: JavaI2, k1: K1, k2: K2) {
+    b.p
+    j1.p
+    k1.p
+    j2.p
+    k2.p
+}
+
 fun testIgn(b: KotlinBase, j1: JavaI1, j2: JavaI2, k1: K1, k2: K2) {
     b.ign()
     j1.ign()