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

K2 JVM IR: fix access to Java field shadowed by Kotlin property

Browse Source 
#KT-56386 Fixed

Co-authored-by: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
This commit is contained in:
Alexander Udalov
2023-02-09 00:57:53 +01:00
parent 641d636c45
commit d73d3c46e2
28 changed files with 363 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
Generated
+12 -6
View File
@@ -28737,6 +28737,18 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaInvisibleFieldAndKotlinPropertyReference.kt");
}
@Test
@TestMetadata("javaPackagePrivateClassAndPublicField.kt")
public void testJavaPackagePrivateClassAndPublicField() throws Exception {
runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaPackagePrivateClassAndPublicField.kt");
}
@Test
@TestMetadata("javaPackagePrivateClassExposedViaProtectedStatic.kt")
public void testJavaPackagePrivateClassExposedViaProtectedStatic() throws Exception {
runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaPackagePrivateClassExposedViaProtectedStatic.kt");
}
@Test
@TestMetadata("javaProtectedFieldAndKotlinInvisibleProperty.kt")
public void testJavaProtectedFieldAndKotlinInvisibleProperty() throws Exception {
@@ -28749,12 +28761,6 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt");
}
@Test
@TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyWrite.kt")
public void testJavaProtectedFieldAndKotlinInvisiblePropertyWrite() throws Exception {
runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAndKotlinInvisiblePropertyWrite.kt");
}
@Test
@TestMetadata("javaProtectedFieldAndKotlinPropertyReference.kt")
public void testJavaProtectedFieldAndKotlinPropertyReference() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBytecodeTextTestGenerated.java
Generated
+12
View File
@@ -253,6 +253,18 @@ public class FirBytecodeTextTestGenerated extends AbstractFirBytecodeTextTest {
runTest("compiler/testData/codegen/bytecodeText/javaFieldsWithIntersectionTypes.kt");
}
@Test
@TestMetadata("javaFieldsWithIntersectionTypes_k1.kt")
public void testJavaFieldsWithIntersectionTypes_k1() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/javaFieldsWithIntersectionTypes_k1.kt");
}
@Test
@TestMetadata("javaFields_k1.kt")
public void testJavaFields_k1() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/javaFields_k1.kt");
}
@Test
@TestMetadata("javaStatics.kt")
public void testJavaStatics() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
Generated
+12 -6
View File
@@ -28737,6 +28737,18 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaInvisibleFieldAndKotlinPropertyReference.kt");
}
@Test
@TestMetadata("javaPackagePrivateClassAndPublicField.kt")
public void testJavaPackagePrivateClassAndPublicField() throws Exception {
runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaPackagePrivateClassAndPublicField.kt");
}
@Test
@TestMetadata("javaPackagePrivateClassExposedViaProtectedStatic.kt")
public void testJavaPackagePrivateClassExposedViaProtectedStatic() throws Exception {
runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaPackagePrivateClassExposedViaProtectedStatic.kt");
}
@Test
@TestMetadata("javaProtectedFieldAndKotlinInvisibleProperty.kt")
public void testJavaProtectedFieldAndKotlinInvisibleProperty() throws Exception {
@@ -28749,12 +28761,6 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAndKotlinInvisiblePropertyReference.kt");
}
@Test
@TestMetadata("javaProtectedFieldAndKotlinInvisiblePropertyWrite.kt")
public void testJavaProtectedFieldAndKotlinInvisiblePropertyWrite() throws Exception {
runTest("compiler/testData/codegen/box/javaFieldAndKotlinProperty/javaProtectedFieldAndKotlinInvisiblePropertyWrite.kt");
}
@Test
@TestMetadata("javaProtectedFieldAndKotlinPropertyReference.kt")
public void testJavaProtectedFieldAndKotlinPropertyReference() throws Exception {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBytecodeTextTestGenerated.java
Generated
+12
View File
@@ -253,6 +253,18 @@ public class FirPsiBytecodeTextTestGenerated extends AbstractFirPsiBytecodeTextT
runTest("compiler/testData/codegen/bytecodeText/javaFieldsWithIntersectionTypes.kt");
}
@Test
@TestMetadata("javaFieldsWithIntersectionTypes_k1.kt")
public void testJavaFieldsWithIntersectionTypes_k1() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/javaFieldsWithIntersectionTypes_k1.kt");
}
@Test
@TestMetadata("javaFields_k1.kt")
public void testJavaFields_k1() throws Exception {
runTest("compiler/testData/codegen/bytecodeText/javaFields_k1.kt");
}
@Test
@TestMetadata("javaStatics.kt")
public void testJavaStatics() throws Exception {