[FIR] Don't create synthetic property if getter and property came from the same class

Usually we create synthetic property in java class if there is a property
  from the base kotlin class and getter/setter with a corresponding name
  in the declared scope or one of supertype scopes. But there is a case,
  where the same supertype contains both property and getter:
```
// FILE: Base.kt
open class Base {
    open val b = "O"

    @JvmName("getBJava")
    fun getB() : String = "K"
}

// FILE: Derived.java
public class Derived extends Base {}
```

In this case we shouldn't create synthetic property, because `getB()`
  function is invisible for `Derived` class

^KT-66020 Fixed

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

@@ -35668,6 +35668,12 @@ public class LLFirBlackBoxCodegenBasedTestGenerated extends AbstractLLFirBlackBo
       runTest("compiler/testData/codegen/box/jvmName/classMembers.kt");
     }
 
+    @Test
+    @TestMetadata("conflictingGetterAndPropertyInBaseKotlinClass.kt")
+    public void testConflictingGetterAndPropertyInBaseKotlinClass() {
+      runTest("compiler/testData/codegen/box/jvmName/conflictingGetterAndPropertyInBaseKotlinClass.kt");
+    }
+
     @Test
     @TestMetadata("fakeJvmNameInJava.kt")
     public void testFakeJvmNameInJava() {

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

@@ -35668,6 +35668,12 @@ public class LLFirReversedBlackBoxCodegenBasedTestGenerated extends AbstractLLFi
       runTest("compiler/testData/codegen/box/jvmName/classMembers.kt");
     }
 
+    @Test
+    @TestMetadata("conflictingGetterAndPropertyInBaseKotlinClass.kt")
+    public void testConflictingGetterAndPropertyInBaseKotlinClass() {
+      runTest("compiler/testData/codegen/box/jvmName/conflictingGetterAndPropertyInBaseKotlinClass.kt");
+    }
+
     @Test
     @TestMetadata("fakeJvmNameInJava.kt")
     public void testFakeJvmNameInJava() {

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

@@ -35519,6 +35519,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
       runTest("compiler/testData/codegen/box/jvmName/classMembers.kt");
     }
 
+    @Test
+    @TestMetadata("conflictingGetterAndPropertyInBaseKotlinClass.kt")
+    public void testConflictingGetterAndPropertyInBaseKotlinClass() {
+      runTest("compiler/testData/codegen/box/jvmName/conflictingGetterAndPropertyInBaseKotlinClass.kt");
+    }
+
     @Test
     @TestMetadata("fakeJvmNameInJava.kt")
     public void testFakeJvmNameInJava() {

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

@@ -35519,6 +35519,12 @@ public class FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated
       runTest("compiler/testData/codegen/box/jvmName/classMembers.kt");
     }
 
+    @Test
+    @TestMetadata("conflictingGetterAndPropertyInBaseKotlinClass.kt")
+    public void testConflictingGetterAndPropertyInBaseKotlinClass() {
+      runTest("compiler/testData/codegen/box/jvmName/conflictingGetterAndPropertyInBaseKotlinClass.kt");
+    }
+
     @Test
     @TestMetadata("fakeJvmNameInJava.kt")
     public void testFakeJvmNameInJava() {

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

@@ -35519,6 +35519,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
       runTest("compiler/testData/codegen/box/jvmName/classMembers.kt");
     }
 
+    @Test
+    @TestMetadata("conflictingGetterAndPropertyInBaseKotlinClass.kt")
+    public void testConflictingGetterAndPropertyInBaseKotlinClass() {
+      runTest("compiler/testData/codegen/box/jvmName/conflictingGetterAndPropertyInBaseKotlinClass.kt");
+    }
+
     @Test
     @TestMetadata("fakeJvmNameInJava.kt")
     public void testFakeJvmNameInJava() {

compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteMemberScope.kt

@@ -175,12 +175,13 @@ class JavaClassUseSiteMemberScope(
     }
 
     internal fun syntheticPropertyFromOverride(overriddenProperty: ResultOfIntersection<FirPropertySymbol>): FirSyntheticPropertySymbol? {
-        val overrideInClass = overriddenProperty.overriddenMembers.firstNotNullOfOrNull { (symbol, _) ->
+        val overrideInClass = overriddenProperty.overriddenMembers.firstNotNullOfOrNull superMember@{ (symbol, baseScope) ->
             // We may call this function at the STATUS phase, which means that using resolved status may lead to cycle
             // So we need to use raw status here
-            if (!symbol.isVisibleInClass(klass.symbol, symbol.rawStatus)) return@firstNotNullOfOrNull null
+            if (!symbol.isVisibleInClass(klass.symbol, symbol.rawStatus)) return@superMember null
             symbol.createOverridePropertyIfExists(declaredMemberScope, takeModalityFromGetter = true)
-                ?: superTypeScopes.firstNotNullOfOrNull { scope ->
+                ?: superTypeScopes.firstNotNullOfOrNull superScope@{ scope ->
+                    if (scope == baseScope) return@superScope null
                     symbol.createOverridePropertyIfExists(scope, takeModalityFromGetter = false)
                 }
         }

compiler/testData/codegen/box/jvmName/conflictingGetterAndPropertyInBaseKotlinClass.kt

@@ -0,0 +1,26 @@
+// TARGET_BACKEND: JVM_IR
+// WITH_STDLIB
+// ISSUE: KT-66020
+
+// FILE: Base.kt
+open class Base {
+    open val b = "O"
+
+    @JvmName("getBJava")
+    fun getB() : String = "K"
+}
+
+// FILE: Derived.java
+public class Derived extends Base {
+    public static String box() {
+        Impl x = new Impl();
+        return x.getB() + x.getBJava();
+    }
+}
+
+// FILE: Impl.kt
+class Impl : Derived()
+
+fun box(): String {
+    return Derived.box()
+}

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

@@ -35519,6 +35519,12 @@ public class JvmAbiConsistencyTestBoxGenerated extends AbstractJvmAbiConsistency
       runTest("compiler/testData/codegen/box/jvmName/classMembers.kt");
     }
 
+    @Test
+    @TestMetadata("conflictingGetterAndPropertyInBaseKotlinClass.kt")
+    public void testConflictingGetterAndPropertyInBaseKotlinClass() {
+      runTest("compiler/testData/codegen/box/jvmName/conflictingGetterAndPropertyInBaseKotlinClass.kt");
+    }
+
     @Test
     @TestMetadata("fakeJvmNameInJava.kt")
     public void testFakeJvmNameInJava() {

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

@@ -35519,6 +35519,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
       runTest("compiler/testData/codegen/box/jvmName/classMembers.kt");
     }
 
+    @Test
+    @TestMetadata("conflictingGetterAndPropertyInBaseKotlinClass.kt")
+    public void testConflictingGetterAndPropertyInBaseKotlinClass() {
+      runTest("compiler/testData/codegen/box/jvmName/conflictingGetterAndPropertyInBaseKotlinClass.kt");
+    }
+
     @Test
     @TestMetadata("fakeJvmNameInJava.kt")
     public void testFakeJvmNameInJava() {

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

@@ -35519,6 +35519,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
       runTest("compiler/testData/codegen/box/jvmName/classMembers.kt");
     }
 
+    @Test
+    @TestMetadata("conflictingGetterAndPropertyInBaseKotlinClass.kt")
+    public void testConflictingGetterAndPropertyInBaseKotlinClass() {
+      runTest("compiler/testData/codegen/box/jvmName/conflictingGetterAndPropertyInBaseKotlinClass.kt");
+    }
+
     @Test
     @TestMetadata("fakeJvmNameInJava.kt")
     public void testFakeJvmNameInJava() {

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

@@ -35519,6 +35519,12 @@ public class FirBlackBoxCodegenTestWithInlineScopesGenerated extends AbstractFir
       runTest("compiler/testData/codegen/box/jvmName/classMembers.kt");
     }
 
+    @Test
+    @TestMetadata("conflictingGetterAndPropertyInBaseKotlinClass.kt")
+    public void testConflictingGetterAndPropertyInBaseKotlinClass() {
+      runTest("compiler/testData/codegen/box/jvmName/conflictingGetterAndPropertyInBaseKotlinClass.kt");
+    }
+
     @Test
     @TestMetadata("fakeJvmNameInJava.kt")
     public void testFakeJvmNameInJava() {

compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java

@@ -30217,6 +30217,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
       runTest("compiler/testData/codegen/box/jvmName/classMembers.kt");
     }
 
+    @TestMetadata("conflictingGetterAndPropertyInBaseKotlinClass.kt")
+    public void testConflictingGetterAndPropertyInBaseKotlinClass() {
+      runTest("compiler/testData/codegen/box/jvmName/conflictingGetterAndPropertyInBaseKotlinClass.kt");
+    }
+
     @TestMetadata("fakeJvmNameInJava.kt")
     public void testFakeJvmNameInJava() {
       runTest("compiler/testData/codegen/box/jvmName/fakeJvmNameInJava.kt");