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

[Fir2IR] Fix fake override generation for lazy accessors

Browse Source 
^KT-65595 Fixed
This commit is contained in:
Pavel Kunyavskiy
2024-02-08 11:53:45 +01:00
committed by Space Team
parent d121b529b5
commit b4062c8974
12 changed files with 83 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java
Generated
+6
View File
@@ -19376,6 +19376,12 @@ public class LLFirBlackBoxCodegenBasedTestGenerated extends AbstractLLFirBlackBo
runTest("compiler/testData/codegen/box/fakeOverride/kt65274.kt");
}
@Test
@TestMetadata("kt65695.kt")
public void testKt65695() throws Exception {
runTest("compiler/testData/codegen/box/fakeOverride/kt65695.kt");
}
@Test
@TestMetadata("methodOfAnyFromInterface.kt")
public void testMethodOfAnyFromInterface() throws Exception {
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java
Generated
+6
View File
@@ -19376,6 +19376,12 @@ public class LLFirReversedBlackBoxCodegenBasedTestGenerated extends AbstractLLFi
runTest("compiler/testData/codegen/box/fakeOverride/kt65274.kt");
}
@Test
@TestMetadata("kt65695.kt")
public void testKt65695() throws Exception {
runTest("compiler/testData/codegen/box/fakeOverride/kt65695.kt");
}
@Test
@TestMetadata("methodOfAnyFromInterface.kt")
public void testMethodOfAnyFromInterface() throws Exception {
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/ClassMemberGenerator.kt
+1 -1
View File
@@ -347,7 +347,7 @@ internal class ClassMemberGenerator(
declarationStorage.leaveScope(this.symbol)
}
}
if (containingClass != null) {
if (containingClass != null && !components.configuration.useIrFakeOverrideBuilder) {
this.overriddenSymbols = property.generateOverriddenAccessorSymbols(containingClass, isGetter)
}
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -19365,6 +19365,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
runTest("compiler/testData/codegen/box/fakeOverride/kt65274.kt");
}
@Test
@TestMetadata("kt65695.kt")
public void testKt65695() throws Exception {
runTest("compiler/testData/codegen/box/fakeOverride/kt65695.kt");
}
@Test
@TestMetadata("methodOfAnyFromInterface.kt")
public void testMethodOfAnyFromInterface() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java
Generated
+6
View File
@@ -19365,6 +19365,12 @@ public class FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated
runTest("compiler/testData/codegen/box/fakeOverride/kt65274.kt");
}
@Test
@TestMetadata("kt65695.kt")
public void testKt65695() throws Exception {
runTest("compiler/testData/codegen/box/fakeOverride/kt65695.kt");
}
@Test
@TestMetadata("methodOfAnyFromInterface.kt")
public void testMethodOfAnyFromInterface() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -19365,6 +19365,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
runTest("compiler/testData/codegen/box/fakeOverride/kt65274.kt");
}
@Test
@TestMetadata("kt65695.kt")
public void testKt65695() throws Exception {
runTest("compiler/testData/codegen/box/fakeOverride/kt65695.kt");
}
@Test
@TestMetadata("methodOfAnyFromInterface.kt")
public void testMethodOfAnyFromInterface() throws Exception {
compiler/testData/codegen/box/fakeOverride/kt65695.kt
Vendored
+23
View File
@@ -0,0 +1,23 @@
// TARGET_BACKEND: JVM
// FILE: A.kt
interface A {
val x: String
}
// FILE: B.kt
interface B : A
// FILE: C.java
public interface C extends B { }
// FILE: D.kt
class D : C {
override val x: String
get() = "OK"
}
// FILE: box.kt
fun go(p: C): String = p.x
fun box(): String = go(D())
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java
Generated
+6
View File
@@ -19365,6 +19365,12 @@ public class JvmAbiConsistencyTestBoxGenerated extends AbstractJvmAbiConsistency
runTest("compiler/testData/codegen/box/fakeOverride/kt65274.kt");
}
@Test
@TestMetadata("kt65695.kt")
public void testKt65695() throws Exception {
runTest("compiler/testData/codegen/box/fakeOverride/kt65695.kt");
}
@Test
@TestMetadata("methodOfAnyFromInterface.kt")
public void testMethodOfAnyFromInterface() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -18507,6 +18507,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/fakeOverride/kt65274.kt");
}
@Test
@TestMetadata("kt65695.kt")
public void testKt65695() throws Exception {
runTest("compiler/testData/codegen/box/fakeOverride/kt65695.kt");
}
@Test
@TestMetadata("methodOfAnyFromInterface.kt")
public void testMethodOfAnyFromInterface() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -19365,6 +19365,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/fakeOverride/kt65274.kt");
}
@Test
@TestMetadata("kt65695.kt")
public void testKt65695() throws Exception {
runTest("compiler/testData/codegen/box/fakeOverride/kt65695.kt");
}
@Test
@TestMetadata("methodOfAnyFromInterface.kt")
public void testMethodOfAnyFromInterface() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
Generated
+6
View File
@@ -19365,6 +19365,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
runTest("compiler/testData/codegen/box/fakeOverride/kt65274.kt");
}
@Test
@TestMetadata("kt65695.kt")
public void testKt65695() throws Exception {
runTest("compiler/testData/codegen/box/fakeOverride/kt65695.kt");
}
@Test
@TestMetadata("methodOfAnyFromInterface.kt")
public void testMethodOfAnyFromInterface() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -16134,6 +16134,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/fakeOverride/kt65274.kt");
}
@TestMetadata("kt65695.kt")
public void testKt65695() throws Exception {
runTest("compiler/testData/codegen/box/fakeOverride/kt65695.kt");
}
@TestMetadata("methodOfAnyFromInterface.kt")
public void testMethodOfAnyFromInterface() throws Exception {
runTest("compiler/testData/codegen/box/fakeOverride/methodOfAnyFromInterface.kt");