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

[FIR] Fix evaluation of Java properties for Char and String types

Browse Source 
#KT-57802
This commit is contained in:
Ivan Kylchik
2023-06-26 18:28:49 +02:00
committed by Space Team
parent bf6f241d4a
commit 8c7c44f9f5
24 changed files with 459 additions and 125 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
+34 -18
View File
@@ -27794,12 +27794,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
@TestMetadata("compiler/testData/codegen/box/involvesIrInterpreter")
@TestDataPath("$PROJECT_ROOT")
public class InvolvesIrInterpreter {
@Test
@TestMetadata("accessTopLevelConstFromJava.kt")
public void testAccessTopLevelConstFromJava() throws Exception {
runTest("compiler/testData/codegen/box/involvesIrInterpreter/accessTopLevelConstFromJava.kt");
}
@Test
public void testAllFilesPresentInInvolvesIrInterpreter() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/involvesIrInterpreter"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
@@ -27829,24 +27823,46 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/involvesIrInterpreter/kt57028.kt");
}
@Test
@TestMetadata("kt57802_1.kt")
public void testKt57802_1() throws Exception {
runTest("compiler/testData/codegen/box/involvesIrInterpreter/kt57802_1.kt");
}
@Test
@TestMetadata("kt57802_2.kt")
public void testKt57802_2() throws Exception {
runTest("compiler/testData/codegen/box/involvesIrInterpreter/kt57802_2.kt");
}
@Test
@TestMetadata("kt58005.kt")
public void testKt58005() throws Exception {
runTest("compiler/testData/codegen/box/involvesIrInterpreter/kt58005.kt");
}
@Nested
@TestMetadata("compiler/testData/codegen/box/involvesIrInterpreter/constEvaluationFromJavaWorld")
@TestDataPath("$PROJECT_ROOT")
public class ConstEvaluationFromJavaWorld {
@Test
@TestMetadata("accessTopLevelConst.kt")
public void testAccessTopLevelConst() throws Exception {
runTest("compiler/testData/codegen/box/involvesIrInterpreter/constEvaluationFromJavaWorld/accessTopLevelConst.kt");
}
@Test
public void testAllFilesPresentInConstEvaluationFromJavaWorld() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/involvesIrInterpreter/constEvaluationFromJavaWorld"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
}
@Test
@TestMetadata("differentTypes.kt")
public void testDifferentTypes() throws Exception {
runTest("compiler/testData/codegen/box/involvesIrInterpreter/constEvaluationFromJavaWorld/differentTypes.kt");
}
@Test
@TestMetadata("kt57802_1.kt")
public void testKt57802_1() throws Exception {
runTest("compiler/testData/codegen/box/involvesIrInterpreter/constEvaluationFromJavaWorld/kt57802_1.kt");
}
@Test
@TestMetadata("kt57802_2.kt")
public void testKt57802_2() throws Exception {
runTest("compiler/testData/codegen/box/involvesIrInterpreter/constEvaluationFromJavaWorld/kt57802_2.kt");
}
}
@Nested
@TestMetadata("compiler/testData/codegen/box/involvesIrInterpreter/intrinsicConst")
@TestDataPath("$PROJECT_ROOT")
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+40 -18
View File
@@ -29066,12 +29066,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
@TestMetadata("compiler/testData/codegen/box/involvesIrInterpreter")
@TestDataPath("$PROJECT_ROOT")
public class InvolvesIrInterpreter {
@Test
@TestMetadata("accessTopLevelConstFromJava.kt")
public void testAccessTopLevelConstFromJava() throws Exception {
runTest("compiler/testData/codegen/box/involvesIrInterpreter/accessTopLevelConstFromJava.kt");
}
@Test
public void testAllFilesPresentInInvolvesIrInterpreter() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/involvesIrInterpreter"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
@@ -29173,18 +29167,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/involvesIrInterpreter/kt57313.kt");
}
@Test
@TestMetadata("kt57802_1.kt")
public void testKt57802_1() throws Exception {
runTest("compiler/testData/codegen/box/involvesIrInterpreter/kt57802_1.kt");
}
@Test
@TestMetadata("kt57802_2.kt")
public void testKt57802_2() throws Exception {
runTest("compiler/testData/codegen/box/involvesIrInterpreter/kt57802_2.kt");
}
@Test
@TestMetadata("kt58005.kt")
public void testKt58005() throws Exception {
@@ -29263,6 +29245,46 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/involvesIrInterpreter/useCorrectToString.kt");
}
@Nested
@TestMetadata("compiler/testData/codegen/box/involvesIrInterpreter/constEvaluationFromJavaWorld")
@TestDataPath("$PROJECT_ROOT")
public class ConstEvaluationFromJavaWorld {
@Test
@TestMetadata("accessComplexConst.kt")
public void testAccessComplexConst() throws Exception {
runTest("compiler/testData/codegen/box/involvesIrInterpreter/constEvaluationFromJavaWorld/accessComplexConst.kt");
}
@Test
@TestMetadata("accessTopLevelConst.kt")
public void testAccessTopLevelConst() throws Exception {
runTest("compiler/testData/codegen/box/involvesIrInterpreter/constEvaluationFromJavaWorld/accessTopLevelConst.kt");
}
@Test
public void testAllFilesPresentInConstEvaluationFromJavaWorld() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/involvesIrInterpreter/constEvaluationFromJavaWorld"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
}
@Test
@TestMetadata("differentTypes.kt")
public void testDifferentTypes() throws Exception {
runTest("compiler/testData/codegen/box/involvesIrInterpreter/constEvaluationFromJavaWorld/differentTypes.kt");
}
@Test
@TestMetadata("kt57802_1.kt")
public void testKt57802_1() throws Exception {
runTest("compiler/testData/codegen/box/involvesIrInterpreter/constEvaluationFromJavaWorld/kt57802_1.kt");
}
@Test
@TestMetadata("kt57802_2.kt")
public void testKt57802_2() throws Exception {
runTest("compiler/testData/codegen/box/involvesIrInterpreter/constEvaluationFromJavaWorld/kt57802_2.kt");
}
}
@Nested
@TestMetadata("compiler/testData/codegen/box/involvesIrInterpreter/intrinsicConst")
@TestDataPath("$PROJECT_ROOT")
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
Generated
+40 -18
View File
@@ -29066,12 +29066,6 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
@TestMetadata("compiler/testData/codegen/box/involvesIrInterpreter")
@TestDataPath("$PROJECT_ROOT")
public class InvolvesIrInterpreter {
@Test
@TestMetadata("accessTopLevelConstFromJava.kt")
public void testAccessTopLevelConstFromJava() throws Exception {
runTest("compiler/testData/codegen/box/involvesIrInterpreter/accessTopLevelConstFromJava.kt");
}
@Test
public void testAllFilesPresentInInvolvesIrInterpreter() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/involvesIrInterpreter"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
@@ -29173,18 +29167,6 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
runTest("compiler/testData/codegen/box/involvesIrInterpreter/kt57313.kt");
}
@Test
@TestMetadata("kt57802_1.kt")
public void testKt57802_1() throws Exception {
runTest("compiler/testData/codegen/box/involvesIrInterpreter/kt57802_1.kt");
}
@Test
@TestMetadata("kt57802_2.kt")
public void testKt57802_2() throws Exception {
runTest("compiler/testData/codegen/box/involvesIrInterpreter/kt57802_2.kt");
}
@Test
@TestMetadata("kt58005.kt")
public void testKt58005() throws Exception {
@@ -29263,6 +29245,46 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
runTest("compiler/testData/codegen/box/involvesIrInterpreter/useCorrectToString.kt");
}
@Nested
@TestMetadata("compiler/testData/codegen/box/involvesIrInterpreter/constEvaluationFromJavaWorld")
@TestDataPath("$PROJECT_ROOT")
public class ConstEvaluationFromJavaWorld {
@Test
@TestMetadata("accessComplexConst.kt")
public void testAccessComplexConst() throws Exception {
runTest("compiler/testData/codegen/box/involvesIrInterpreter/constEvaluationFromJavaWorld/accessComplexConst.kt");
}
@Test
@TestMetadata("accessTopLevelConst.kt")
public void testAccessTopLevelConst() throws Exception {
runTest("compiler/testData/codegen/box/involvesIrInterpreter/constEvaluationFromJavaWorld/accessTopLevelConst.kt");
}
@Test
public void testAllFilesPresentInConstEvaluationFromJavaWorld() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/involvesIrInterpreter/constEvaluationFromJavaWorld"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
}
@Test
@TestMetadata("differentTypes.kt")
public void testDifferentTypes() throws Exception {
runTest("compiler/testData/codegen/box/involvesIrInterpreter/constEvaluationFromJavaWorld/differentTypes.kt");
}
@Test
@TestMetadata("kt57802_1.kt")
public void testKt57802_1() throws Exception {
runTest("compiler/testData/codegen/box/involvesIrInterpreter/constEvaluationFromJavaWorld/kt57802_1.kt");
}
@Test
@TestMetadata("kt57802_2.kt")
public void testKt57802_2() throws Exception {
runTest("compiler/testData/codegen/box/involvesIrInterpreter/constEvaluationFromJavaWorld/kt57802_2.kt");
}
}
@Nested
@TestMetadata("compiler/testData/codegen/box/involvesIrInterpreter/intrinsicConst")
@TestDataPath("$PROJECT_ROOT")