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

[K/JS] Fix reexport with CommonJS and incremental compilation

Browse Source
This commit is contained in:
Artem Kobzar
2023-10-26 09:58:35 +00:00
committed by Space Team
parent 2bb3b84e7e
commit 6cd42eeb71
21 changed files with 163 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/ic/JsExecutableProducer.kt
+1 -1
View File
@@ -29,7 +29,7 @@ class JsExecutableProducer(
fun buildExecutable(granularity: JsGenerationGranularity, outJsProgram: Boolean) =
when (granularity) {
JsGenerationGranularity.WHOLE_PROGRAM -> buildSingleModuleExecutable(outJsProgram)
JsGenerationGranularity.PER_MODULE -> buildMultiArtifactExecutable(outJsProgram, JsPerModuleCache(caches))
JsGenerationGranularity.PER_MODULE -> buildMultiArtifactExecutable(outJsProgram, JsPerModuleCache(moduleKind, caches))
JsGenerationGranularity.PER_FILE -> buildMultiArtifactExecutable(outJsProgram, JsPerFileCache(caches))
}
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/ic/JsPerModuleCache.kt
+13 -2
View File
@@ -6,9 +6,13 @@
package org.jetbrains.kotlin.ir.backend.js.ic
import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.*
import org.jetbrains.kotlin.serialization.js.ModuleKind
import java.io.File
class JsPerModuleCache(private val moduleArtifacts: List<ModuleArtifact>) : JsMultiArtifactCache<JsPerModuleCache.CachedModuleInfo>() {
class JsPerModuleCache(
private val moduleKind: ModuleKind,
private val moduleArtifacts: List<ModuleArtifact>
) : JsMultiArtifactCache<JsPerModuleCache.CachedModuleInfo>() {
companion object {
private const val JS_MODULE_HEADER = "js.module.header.bin"
private const val CACHED_MODULE_JS = "module.js"
@@ -73,8 +77,15 @@ class JsPerModuleCache(private val moduleArtifacts: List<ModuleArtifact>) : JsMu
} ?: compilationOutputs
override fun loadProgramHeadersFromCache(): List<CachedModuleInfo> {
val mainModule = moduleArtifacts.last()
return moduleArtifacts.map { artifact ->
fun loadModuleInfo() = CachedModuleInfo(artifact, artifact.loadJsIrModule().makeModuleHeader())
fun loadModuleInfo() = CachedModuleInfo(
artifact,
artifact
.loadJsIrModule(mainModule.moduleSafeName.takeIf { moduleKind !== ModuleKind.ES && artifact !== mainModule })
.makeModuleHeader()
)
val actualInfo = when {
artifact.forceRebuildJs -> loadModuleInfo()
artifact.fileArtifacts.any { it.isModified() } -> loadModuleInfo()
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/ic/ModuleArtifact.kt
+2 -2
View File
@@ -32,11 +32,11 @@ class ModuleArtifact(
val moduleSafeName = moduleName.safeModuleName
val moduleExternalName = externalModuleName ?: moduleSafeName
fun loadJsIrModule(): JsIrModule {
fun loadJsIrModule(reexportedInModuleWithName: String? = null): JsIrModule {
val fragments = fileArtifacts.sortedBy { it.srcFilePath }.flatMap {
val fragments = it.loadJsIrFragments()
listOfNotNull(fragments?.mainFragment, fragments?.exportFragment)
}
return JsIrModule(moduleSafeName, moduleExternalName, fragments)
return JsIrModule(moduleSafeName, moduleExternalName, fragments, reexportedInModuleWithName)
}
}