diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java index a7745f97582..a7e7e148186 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java @@ -33428,6 +33428,12 @@ public class LLFirBlackBoxCodegenBasedTestGenerated extends AbstractLLFirBlackBo runTest("compiler/testData/codegen/box/jvmField/kt48295a.kt"); } + @Test + @TestMetadata("noClashWithInheritedJavaMethod.kt") + public void testNoClashWithInheritedJavaMethod() throws Exception { + runTest("compiler/testData/codegen/box/jvmField/noClashWithInheritedJavaMethod.kt"); + } + @Test @TestMetadata("publicField.kt") public void testPublicField() throws Exception { diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java index a6bbc97cc3c..f92054c7591 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java @@ -33428,6 +33428,12 @@ public class LLFirReversedBlackBoxCodegenBasedTestGenerated extends AbstractLLFi runTest("compiler/testData/codegen/box/jvmField/kt48295a.kt"); } + @Test + @TestMetadata("noClashWithInheritedJavaMethod.kt") + public void testNoClashWithInheritedJavaMethod() throws Exception { + runTest("compiler/testData/codegen/box/jvmField/noClashWithInheritedJavaMethod.kt"); + } + @Test @TestMetadata("publicField.kt") public void testPublicField() throws Exception { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java index 3b8bfc1cf5e..df07de26ad2 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java @@ -33073,6 +33073,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr runTest("compiler/testData/codegen/box/jvmField/kt48295a.kt"); } + @Test + @TestMetadata("noClashWithInheritedJavaMethod.kt") + public void testNoClashWithInheritedJavaMethod() throws Exception { + runTest("compiler/testData/codegen/box/jvmField/noClashWithInheritedJavaMethod.kt"); + } + @Test @TestMetadata("publicField.kt") public void testPublicField() throws Exception { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java index db0a2eac9a7..7e123a5b80a 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java @@ -33073,6 +33073,12 @@ public class FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated runTest("compiler/testData/codegen/box/jvmField/kt48295a.kt"); } + @Test + @TestMetadata("noClashWithInheritedJavaMethod.kt") + public void testNoClashWithInheritedJavaMethod() throws Exception { + runTest("compiler/testData/codegen/box/jvmField/noClashWithInheritedJavaMethod.kt"); + } + @Test @TestMetadata("publicField.kt") public void testPublicField() throws Exception { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java index e944e988742..1f9ec8d6927 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java @@ -33073,6 +33073,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo runTest("compiler/testData/codegen/box/jvmField/kt48295a.kt"); } + @Test + @TestMetadata("noClashWithInheritedJavaMethod.kt") + public void testNoClashWithInheritedJavaMethod() throws Exception { + runTest("compiler/testData/codegen/box/jvmField/noClashWithInheritedJavaMethod.kt"); + } + @Test @TestMetadata("publicField.kt") public void testPublicField() throws Exception { diff --git a/compiler/testData/codegen/box/jvmField/noClashWithInheritedJavaMethod.kt b/compiler/testData/codegen/box/jvmField/noClashWithInheritedJavaMethod.kt new file mode 100644 index 00000000000..ae9ff3b17c5 --- /dev/null +++ b/compiler/testData/codegen/box/jvmField/noClashWithInheritedJavaMethod.kt @@ -0,0 +1,22 @@ +// TARGET_BACKEND: JVM_IR +// WITH_STDLIB +// MODULE: lib +// FILE: A.java +public class A { + final public boolean isVisible() { + return true; + } +} + +// FILE: B.kt +abstract class B : A() { + @JvmField + protected var isVisible = false +} + +// MODULE: main(lib) +// FILE: box.kt +class C : B() + +fun box(): String = + if (C().isVisible()) "OK" else "Fail" diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java index 9194ae2f7bb..0c4e487ad38 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java @@ -33073,6 +33073,12 @@ public class JvmAbiConsistencyTestBoxGenerated extends AbstractJvmAbiConsistency runTest("compiler/testData/codegen/box/jvmField/kt48295a.kt"); } + @Test + @TestMetadata("noClashWithInheritedJavaMethod.kt") + public void testNoClashWithInheritedJavaMethod() throws Exception { + runTest("compiler/testData/codegen/box/jvmField/noClashWithInheritedJavaMethod.kt"); + } + @Test @TestMetadata("publicField.kt") public void testPublicField() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java index 1185e8fc0b8..7c9fb5d9aa5 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java @@ -33073,6 +33073,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/jvmField/kt48295a.kt"); } + @Test + @TestMetadata("noClashWithInheritedJavaMethod.kt") + public void testNoClashWithInheritedJavaMethod() throws Exception { + runTest("compiler/testData/codegen/box/jvmField/noClashWithInheritedJavaMethod.kt"); + } + @Test @TestMetadata("publicField.kt") public void testPublicField() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java index 930c38bfabd..6143b660cfa 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java @@ -33073,6 +33073,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack runTest("compiler/testData/codegen/box/jvmField/kt48295a.kt"); } + @Test + @TestMetadata("noClashWithInheritedJavaMethod.kt") + public void testNoClashWithInheritedJavaMethod() throws Exception { + runTest("compiler/testData/codegen/box/jvmField/noClashWithInheritedJavaMethod.kt"); + } + @Test @TestMetadata("publicField.kt") public void testPublicField() throws Exception { diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index 34a56e8b1de..b3a8b5545bc 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -28132,6 +28132,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/jvmField/kt48295a.kt"); } + @TestMetadata("noClashWithInheritedJavaMethod.kt") + public void testNoClashWithInheritedJavaMethod() throws Exception { + runTest("compiler/testData/codegen/box/jvmField/noClashWithInheritedJavaMethod.kt"); + } + @TestMetadata("publicField.kt") public void testPublicField() throws Exception { runTest("compiler/testData/codegen/box/jvmField/publicField.kt");