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

Make sure lateinit top-level properties work in JVM BE

Browse Source
This commit is contained in:
Dmitry Petrov
2017-06-01 15:21:39 +03:00
parent d951e957ea
commit 01cce59c35
9 changed files with 262 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/properties/lateinit/topLevel/accessorException.kt
Vendored
+27
View File
@@ -0,0 +1,27 @@
// WITH_REFLECT
// IGNORE_BACKEND: JS, NATIVE
// FILE: lateinit.kt
private lateinit var s: String
object C {
fun setS(value: String) { s = value }
fun getS() = s
}
// FILE: test.kt
import kotlin.UninitializedPropertyAccessException
fun box(): String {
var str2: String = ""
try {
str2 = C.getS()
return "Should throw an exception"
}
catch (e: UninitializedPropertyAccessException) {
return "OK"
}
catch (e: Throwable) {
return "Unexpected exception: ${e::class.qualifiedName}"
}
}
compiler/testData/codegen/box/properties/lateinit/topLevel/accessorForTopLevelLateinit.kt
Vendored
+13
View File
@@ -0,0 +1,13 @@
// FILE: lateinit.kt
private lateinit var s: String
object C {
fun setS(value: String) { s = value }
fun getS() = s
}
// FILE: test.kt
fun box(): String {
C.setS("OK")
return C.getS()
}
compiler/testData/codegen/box/properties/lateinit/topLevel/topLevelLateinit.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
lateinit var ok: String
fun box(): String {
run {
ok = "OK"
}
return ok
}
compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedMemberAccess.kt
Vendored
+20
View File
@@ -0,0 +1,20 @@
// WITH_REFLECT
// IGNORE_BACKEND: JS, NATIVE
import kotlin.UninitializedPropertyAccessException
lateinit var str: String
fun box(): String {
var i: Int = 0
try {
i = str.length
return "Should throw an exception"
}
catch (e: UninitializedPropertyAccessException) {
return "OK"
}
catch (e: Throwable) {
return "Unexpected exception: ${e::class.qualifiedName}"
}
}
compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedRead.kt
Vendored
+20
View File
@@ -0,0 +1,20 @@
// WITH_REFLECT
// IGNORE_BACKEND: JS, NATIVE
import kotlin.UninitializedPropertyAccessException
lateinit var str: String
fun box(): String {
var str2: String = ""
try {
str2 = str
return "Should throw an exception"
}
catch (e: UninitializedPropertyAccessException) {
return "OK"
}
catch (e: Throwable) {
return "Unexpected exception: ${e::class.qualifiedName}"
}
}
compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
+39
View File
@@ -13419,6 +13419,45 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
doTest(fileName);
}
}
@TestMetadata("compiler/testData/codegen/box/properties/lateinit/topLevel")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class TopLevel extends AbstractIrBlackBoxCodegenTest {
@TestMetadata("accessorException.kt")
public void testAccessorException() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/topLevel/accessorException.kt");
doTest(fileName);
}
@TestMetadata("accessorForTopLevelLateinit.kt")
public void testAccessorForTopLevelLateinit() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/topLevel/accessorForTopLevelLateinit.kt");
doTest(fileName);
}
public void testAllFilesPresentInTopLevel() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/properties/lateinit/topLevel"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM, true);
}
@TestMetadata("topLevelLateinit.kt")
public void testTopLevelLateinit() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/topLevel/topLevelLateinit.kt");
doTest(fileName);
}
@TestMetadata("uninitializedMemberAccess.kt")
public void testUninitializedMemberAccess() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedMemberAccess.kt");
doTest(fileName);
}
@TestMetadata("uninitializedRead.kt")
public void testUninitializedRead() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedRead.kt");
doTest(fileName);
}
}
}
}
compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
+39
View File
@@ -13419,6 +13419,45 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
doTest(fileName);
}
}
@TestMetadata("compiler/testData/codegen/box/properties/lateinit/topLevel")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class TopLevel extends AbstractBlackBoxCodegenTest {
@TestMetadata("accessorException.kt")
public void testAccessorException() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/topLevel/accessorException.kt");
doTest(fileName);
}
@TestMetadata("accessorForTopLevelLateinit.kt")
public void testAccessorForTopLevelLateinit() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/topLevel/accessorForTopLevelLateinit.kt");
doTest(fileName);
}
public void testAllFilesPresentInTopLevel() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/properties/lateinit/topLevel"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM, true);
}
@TestMetadata("topLevelLateinit.kt")
public void testTopLevelLateinit() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/topLevel/topLevelLateinit.kt");
doTest(fileName);
}
@TestMetadata("uninitializedMemberAccess.kt")
public void testUninitializedMemberAccess() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedMemberAccess.kt");
doTest(fileName);
}
@TestMetadata("uninitializedRead.kt")
public void testUninitializedRead() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedRead.kt");
doTest(fileName);
}
}
}
}
compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
+39
View File
@@ -13419,6 +13419,45 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
doTest(fileName);
}
}
@TestMetadata("compiler/testData/codegen/box/properties/lateinit/topLevel")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class TopLevel extends AbstractLightAnalysisModeTest {
@TestMetadata("accessorException.kt")
public void testAccessorException() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/topLevel/accessorException.kt");
doTest(fileName);
}
@TestMetadata("accessorForTopLevelLateinit.kt")
public void testAccessorForTopLevelLateinit() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/topLevel/accessorForTopLevelLateinit.kt");
doTest(fileName);
}
public void testAllFilesPresentInTopLevel() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/properties/lateinit/topLevel"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM, true);
}
@TestMetadata("topLevelLateinit.kt")
public void testTopLevelLateinit() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/topLevel/topLevelLateinit.kt");
doTest(fileName);
}
@TestMetadata("uninitializedMemberAccess.kt")
public void testUninitializedMemberAccess() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedMemberAccess.kt");
doTest(fileName);
}
@TestMetadata("uninitializedRead.kt")
public void testUninitializedRead() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedRead.kt");
doTest(fileName);
}
}
}
}
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
+57
View File
@@ -15069,6 +15069,63 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
throw new AssertionError("Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that.");
}
}
@TestMetadata("compiler/testData/codegen/box/properties/lateinit/topLevel")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class TopLevel extends AbstractJsCodegenBoxTest {
@TestMetadata("accessorException.kt")
public void testAccessorException() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/topLevel/accessorException.kt");
try {
doTest(fileName);
}
catch (Throwable ignore) {
return;
}
throw new AssertionError("Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that.");
}
@TestMetadata("accessorForTopLevelLateinit.kt")
public void testAccessorForTopLevelLateinit() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/topLevel/accessorForTopLevelLateinit.kt");
doTest(fileName);
}
public void testAllFilesPresentInTopLevel() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/properties/lateinit/topLevel"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JS, true);
}
@TestMetadata("topLevelLateinit.kt")
public void testTopLevelLateinit() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/topLevel/topLevelLateinit.kt");
doTest(fileName);
}
@TestMetadata("uninitializedMemberAccess.kt")
public void testUninitializedMemberAccess() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedMemberAccess.kt");
try {
doTest(fileName);
}
catch (Throwable ignore) {
return;
}
throw new AssertionError("Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that.");
}
@TestMetadata("uninitializedRead.kt")
public void testUninitializedRead() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedRead.kt");
try {
doTest(fileName);
}
catch (Throwable ignore) {
return;
}
throw new AssertionError("Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that.");
}
}
}
}