azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR2IR] Don't generate fake overrides for clashing synthetic properties

Browse Source 
If a synthetic prop clashes with a real property (e.g. @JvmField
property from parent Kotlin class), don't generate fake override for the
synthetic property. This fixes a CONFLICTING_INHERITED_JVM_DECLARATIONS
error in a mixed hierarchy.

^KT-56538 Fixed
This commit is contained in:
Kirill Rakhman
2023-02-13 18:03:32 +01:00
committed by Space Team
parent d84490dcfa
commit 7f8dc56d36
6 changed files with 67 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -27585,6 +27585,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/javaInterop/superCallOfPrintStackTrace.kt");
}
@Test
@TestMetadata("syntheticPropClashingWithJvmField.kt")
public void testSyntheticPropClashingWithJvmField() throws Exception {
runTest("compiler/testData/codegen/box/javaInterop/syntheticPropClashingWithJvmField.kt");
}
@Test
@TestMetadata("unresolvedJavaClassInDifferentFile.kt")
public void testUnresolvedJavaClassInDifferentFile() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -28827,6 +28827,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/javaInterop/superCallOfPrintStackTrace.kt");
}
@Test
@TestMetadata("syntheticPropClashingWithJvmField.kt")
public void testSyntheticPropClashingWithJvmField() throws Exception {
runTest("compiler/testData/codegen/box/javaInterop/syntheticPropClashingWithJvmField.kt");
}
@Test
@TestMetadata("unresolvedJavaClassInDifferentFile.kt")
public void testUnresolvedJavaClassInDifferentFile() throws Exception {