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

[K/JS] Support eager initialization for per-file granularity

Browse Source
This commit is contained in:
Artem Kobzar
2023-09-06 09:27:28 +00:00
committed by Space Team
parent f203681ffa
commit bff433f4e9
22 changed files with 288 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.ast/src/org/jetbrains/kotlin/js/backend/JsToStringGenerationVisitor.java
+4 -1
View File
@@ -1404,7 +1404,10 @@ public class JsToStringGenerationVisitor extends JsVisitor {
p.print("}");
}
p.print(" from ");
if (!(target == JsImport.Target.Effect.INSTANCE)) {
p.print(" from ");
}
p.print(javaScriptString(jsImport.getModule()));
}
js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsImport.kt
+2
View File
@@ -15,6 +15,7 @@ class JsImport(
get() = (target as Target.Elements).elements
sealed class Target {
object Effect : Target()
class Elements(val elements: MutableList<Element>) : Target()
class Default(val name: JsNameRef) : Target() {
constructor(name: String) : this(JsNameRef(name))
@@ -36,6 +37,7 @@ class JsImport(
override fun acceptChildren(visitor: JsVisitor) {
when (target) {
is Target.Effect -> {}
is Target.All -> visitor.accept(target.alias)
is Target.Default -> visitor.accept(target.name)
is Target.Elements -> target.elements.forEach {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsBoxTestGenerated.java
Generated
+18
View File
@@ -2041,6 +2041,24 @@ public class FirJsBoxTestGenerated extends AbstractFirJsBoxTest {
runTest("js/js.translator/testData/box/esModules/crossModuleRefPerFile/constructor.kt");
}
@Test
@TestMetadata("eagerInitializationGlobal1.kt")
public void testEagerInitializationGlobal1() throws Exception {
runTest("js/js.translator/testData/box/esModules/crossModuleRefPerFile/eagerInitializationGlobal1.kt");
}
@Test
@TestMetadata("eagerInitializationGlobal2.kt")
public void testEagerInitializationGlobal2() throws Exception {
runTest("js/js.translator/testData/box/esModules/crossModuleRefPerFile/eagerInitializationGlobal2.kt");
}
@Test
@TestMetadata("eagerInitializationGlobal3.kt")
public void testEagerInitializationGlobal3() throws Exception {
runTest("js/js.translator/testData/box/esModules/crossModuleRefPerFile/eagerInitializationGlobal3.kt");
}
@Test
@TestMetadata("inheritance.kt")
public void testInheritance() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6BoxTestGenerated.java
Generated
+18
View File
@@ -2147,6 +2147,24 @@ public class FirJsES6BoxTestGenerated extends AbstractFirJsES6BoxTest {
runTest("js/js.translator/testData/box/esModules/crossModuleRefPerFile/constructor.kt");
}
@Test
@TestMetadata("eagerInitializationGlobal1.kt")
public void testEagerInitializationGlobal1() throws Exception {
runTest("js/js.translator/testData/box/esModules/crossModuleRefPerFile/eagerInitializationGlobal1.kt");
}
@Test
@TestMetadata("eagerInitializationGlobal2.kt")
public void testEagerInitializationGlobal2() throws Exception {
runTest("js/js.translator/testData/box/esModules/crossModuleRefPerFile/eagerInitializationGlobal2.kt");
}
@Test
@TestMetadata("eagerInitializationGlobal3.kt")
public void testEagerInitializationGlobal3() throws Exception {
runTest("js/js.translator/testData/box/esModules/crossModuleRefPerFile/eagerInitializationGlobal3.kt");
}
@Test
@TestMetadata("inheritance.kt")
public void testInheritance() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrBoxJsES6TestGenerated.java
Generated
+18
View File
@@ -2147,6 +2147,24 @@ public class IrBoxJsES6TestGenerated extends AbstractIrBoxJsES6Test {
runTest("js/js.translator/testData/box/esModules/crossModuleRefPerFile/constructor.kt");
}
@Test
@TestMetadata("eagerInitializationGlobal1.kt")
public void testEagerInitializationGlobal1() throws Exception {
runTest("js/js.translator/testData/box/esModules/crossModuleRefPerFile/eagerInitializationGlobal1.kt");
}
@Test
@TestMetadata("eagerInitializationGlobal2.kt")
public void testEagerInitializationGlobal2() throws Exception {
runTest("js/js.translator/testData/box/esModules/crossModuleRefPerFile/eagerInitializationGlobal2.kt");
}
@Test
@TestMetadata("eagerInitializationGlobal3.kt")
public void testEagerInitializationGlobal3() throws Exception {
runTest("js/js.translator/testData/box/esModules/crossModuleRefPerFile/eagerInitializationGlobal3.kt");
}
@Test
@TestMetadata("inheritance.kt")
public void testInheritance() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrBoxJsTestGenerated.java
Generated
+18
View File
@@ -2041,6 +2041,24 @@ public class IrBoxJsTestGenerated extends AbstractIrBoxJsTest {
runTest("js/js.translator/testData/box/esModules/crossModuleRefPerFile/constructor.kt");
}
@Test
@TestMetadata("eagerInitializationGlobal1.kt")
public void testEagerInitializationGlobal1() throws Exception {
runTest("js/js.translator/testData/box/esModules/crossModuleRefPerFile/eagerInitializationGlobal1.kt");
}
@Test
@TestMetadata("eagerInitializationGlobal2.kt")
public void testEagerInitializationGlobal2() throws Exception {
runTest("js/js.translator/testData/box/esModules/crossModuleRefPerFile/eagerInitializationGlobal2.kt");
}
@Test
@TestMetadata("eagerInitializationGlobal3.kt")
public void testEagerInitializationGlobal3() throws Exception {
runTest("js/js.translator/testData/box/esModules/crossModuleRefPerFile/eagerInitializationGlobal3.kt");
}
@Test
@TestMetadata("inheritance.kt")
public void testInheritance() throws Exception {
js/js.translator/testData/box/esModules/crossModuleRefPerFile/eagerInitializationGlobal1.kt
Vendored
+28
View File
@@ -0,0 +1,28 @@
// TARGET_BACKEND: JS_IR
// IGNORE_BACKEND: WASM
// ES_MODULES
// PROPERTY_LAZY_INITIALIZATION
// FILE: lib.kt
var z1 = false
var z2 = false
// FILE: lib2.kt
@OptIn(kotlin.ExperimentalStdlibApi::class)
@EagerInitialization
val x = foo()
private fun foo(): Int {
z1 = true
return 42
}
// Will be initialized since [x]'s initializer calls a function from the file.
val y = run { z2 = true; 117 }
// FILE: main.kt
fun box(): String {
return return if (z1 && z2) "OK" else "fail"
}
js/js.translator/testData/box/esModules/crossModuleRefPerFile/eagerInitializationGlobal2.kt
Vendored
+23
View File
@@ -0,0 +1,23 @@
// TARGET_BACKEND: JS_IR
// IGNORE_BACKEND: WASM
// ES_MODULES
// PROPERTY_LAZY_INITIALIZATION
// FILE: lib.kt
var z1 = false
var z2 = false
// FILE: lib2.kt
@OptIn(kotlin.ExperimentalStdlibApi::class)
@EagerInitialization
val x = run { z1 = true; 42 }
// Won't be initialized (cause no function from the file will be called during [x] initialization).
val y = run { z2 = true; 117 }
// FILE: main.kt
fun box(): String {
return if (z1 && !z2) "OK" else "fail"
}
js/js.translator/testData/box/esModules/crossModuleRefPerFile/eagerInitializationGlobal3.kt
Vendored
+19
View File
@@ -0,0 +1,19 @@
// TARGET_BACKEND: JS_IR
// IGNORE_BACKEND: WASM
// ES_MODULES
// PROPERTY_LAZY_INITIALIZATION
// FILE: lib.kt
var z1 = false
// FILE: lib2.kt
@OptIn(kotlin.ExperimentalStdlibApi::class)
@EagerInitialization
val x = run { z1 = !z1; 42 }
val y = run { 73 }
fun box(): String {
return if (z1) "OK" else "fail"
}
js/js.translator/testData/incremental/invalidation/eagerInitialization/project.info
Vendored
+11 -3
View File
@@ -1,10 +1,18 @@
IGNORE_PER_FILE: true
MODULES: lib1, main
STEP 0:
libs: lib1, main
dirty js modules: lib1, main
STEP 1..3:
dirty js files: lib1/l1, lib1/l2, main/m, main/m.export, main
STEP 1:
libs: lib1, main
dirty js modules: lib1
dirty js files: lib1/l2, lib1, main
STEP 2:
libs: lib1, main
dirty js modules: lib1
dirty js files: lib1/l2
STEP 3:
libs: lib1, main
dirty js modules: lib1
dirty js files: lib1/l2, main