Lowerings apply to a list of modules

compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/Lower.kt

@@ -67,6 +67,14 @@ interface BodyLoweringPass : FileLoweringPass {
 
 fun FileLoweringPass.lower(moduleFragment: IrModuleFragment) = moduleFragment.files.forEach { lower(it) }
 
+//fun FileLoweringPass.lower(modules: Iterable<IrModuleFragment>) {
+//    modules.forEach { module ->
+//        module.files.forEach {
+//            lower(it)
+//        }
+//    }
+//}
+
 fun ClassLoweringPass.runOnFilePostfix(irFile: IrFile) {
     irFile.acceptVoid(object : IrElementVisitorVoid {
         override fun visitElement(element: IrElement) {

compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt

@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.backend.common.lower.loops.ForLoopsLowering
 import org.jetbrains.kotlin.backend.common.lower.optimizations.FoldConstantLowering
 import org.jetbrains.kotlin.backend.common.lower.optimizations.PropertyAccessorInlineLowering
 import org.jetbrains.kotlin.backend.common.phaser.*
+import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.backend.js.lower.*
 import org.jetbrains.kotlin.ir.backend.js.lower.calls.CallsLowering
 import org.jetbrains.kotlin.ir.backend.js.lower.cleanup.CleanupLowering
@@ -34,7 +35,7 @@ private fun makeJsModulePhase(
     description: String,
     prerequisite: Set<AnyNamedPhase> = emptySet()
 ) = makeCustomJsModulePhase(
-    op = { context, moduleFragment -> lowering(context).lower(moduleFragment) },
+    op = { context, modules -> lowering(context).lower(modules) },
     name = name,
     description = description,
     prerequisite = prerequisite
@@ -49,27 +50,36 @@ private fun makeCustomJsModulePhase(
     name = name,
     description = description,
     prerequisite = prerequisite,
-    lower = object : SameTypeCompilerPhase<JsIrBackendContext, IrModuleFragment> {
+    lower = object : SameTypeCompilerPhase<JsIrBackendContext, Iterable<IrModuleFragment>> {
         override fun invoke(
             phaseConfig: PhaseConfig,
-            phaserState: PhaserState<IrModuleFragment>,
+            phaserState: PhaserState<Iterable<IrModuleFragment>>,
             context: JsIrBackendContext,
-            input: IrModuleFragment
-        ): IrModuleFragment {
-            op(context, input)
+            input: Iterable<IrModuleFragment>
+        ): Iterable<IrModuleFragment> {
+            input.forEach { module ->
+                op(context, module)
+            }
             return input
         }
     },
     preconditions = emptySet(),
     postconditions = emptySet(),
     stickyPostconditions = emptySet(),
-    actions = setOf(defaultDumper, validationAction),
+    actions = setOf(defaultDumper.toMultiModuleAction(), validationAction.toMultiModuleAction()),
     nlevels = 0
 )
 
-sealed class Lowering(val name: String) {
+private fun <C> Action<IrElement, C>.toMultiModuleAction(): Action<Iterable<IrModuleFragment>, C> {
+    return { state, modules, context ->
+        modules.forEach { module ->
+            this(state, module, context)
+        }
+    }
+}
 
-    abstract val modulePhase: SameTypeNamedPhaseWrapper<JsIrBackendContext, IrModuleFragment>
+sealed class Lowering(val name: String) {
+    abstract val modulePhase: SameTypeNamedPhaseWrapper<JsIrBackendContext, Iterable<IrModuleFragment>>
 }
 
 class DeclarationLowering(
@@ -100,7 +110,7 @@ class BodyLowering(
 
 class ModuleLowering(
     name: String,
-    override val modulePhase: SameTypeNamedPhaseWrapper<JsIrBackendContext, IrModuleFragment>
+    override val modulePhase: SameTypeNamedPhaseWrapper<JsIrBackendContext, Iterable<IrModuleFragment>>
 ) : Lowering(name)
 
 private fun makeDeclarationTransformerPhase(
@@ -117,7 +127,7 @@ private fun makeBodyLoweringPhase(
     prerequisite: Set<Lowering> = emptySet()
 ) = BodyLowering(name, description, prerequisite.map { it.modulePhase }.toSet(), lowering)
 
-fun SameTypeNamedPhaseWrapper<JsIrBackendContext, IrModuleFragment>.toModuleLowering() = ModuleLowering(this.name, this)
+fun SameTypeNamedPhaseWrapper<JsIrBackendContext, Iterable<IrModuleFragment>>.toModuleLowering() = ModuleLowering(this.name, this)
 
 private val validateIrBeforeLowering = makeCustomJsModulePhase(
     { context, module -> validationCallback(context, module) },
@@ -131,7 +141,7 @@ private val validateIrAfterLowering = makeCustomJsModulePhase(
     description = "Validate IR after lowering"
 ).toModuleLowering()
 
-val scriptRemoveReceiverLowering = makeIrModulePhase(
+val scriptRemoveReceiverLowering = makeJsModulePhase(
     ::ScriptRemoveReceiverLowering,
     name = "ScriptRemoveReceiver",
     description = "Remove receivers for declarations in script"
@@ -515,7 +525,7 @@ private val bridgesConstructionPhase = makeDeclarationTransformerPhase(
     prerequisite = setOf(suspendFunctionsLoweringPhase)
 )
 
-private val singleAbstractMethodPhase = makeIrModulePhase(
+private val singleAbstractMethodPhase = makeJsModulePhase(
     ::JsSingleAbstractMethodLowering,
     name = "SingleAbstractMethod",
     description = "Replace SAM conversions with instances of interface-implementing classes"
@@ -726,14 +736,19 @@ val loweringList = listOf<Lowering>(
     validateIrAfterLowering
 )
 
-// TODO comment? Eliminate MouduleLowering's? Don't filter them here?
+// TODO comment? Eliminate ModuleLowering's? Don't filter them here?
 val pirLowerings = loweringList.filter { it is DeclarationLowering || it is BodyLowering } + staticMembersLoweringPhase
 
 // TODO `fold` -> `reduce`
-val jsPhases = namedIrModulePhase(
+val jsPhases = SameTypeNamedPhaseWrapper(
     name = "IrModuleLowering",
     description = "IR module lowering",
-    lower = loweringList.drop(1).fold(loweringList[0].modulePhase) { acc: CompilerPhase<JsIrBackendContext, IrModuleFragment, IrModuleFragment>, lowering ->
-        acc.then(lowering.modulePhase)
-    }
+    prerequisite = emptySet(),
+    lower = loweringList.map { it.modulePhase as CompilerPhase<JsIrBackendContext, Iterable<IrModuleFragment>, Iterable<IrModuleFragment>> }
+        .reduce { acc, lowering -> acc.then(lowering) },
+    preconditions = emptySet(),
+    postconditions = emptySet(),
+    stickyPostconditions = emptySet(),
+    actions = setOf(defaultDumper.toMultiModuleAction(), validationAction.toMultiModuleAction()),
+    nlevels = 1
 )

compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/compiler.kt

@@ -98,7 +98,7 @@ fun compile(
         val transformer = IrModuleToJsTransformer(context, mainFunction, mainArguments)
         return transformer.generateModule(moduleFragment, fullJs = true, dceJs = false)
     } else {
-        jsPhases.invokeToplevel(phaseConfig, context, moduleFragment)
+        jsPhases.invokeToplevel(phaseConfig, context, listOf(moduleFragment))
         val transformer = IrModuleToJsTransformer(context, mainFunction, mainArguments)
         return transformer.generateModule(moduleFragment, generateFullJs, generateDceJs)
     }
@@ -110,7 +110,7 @@ fun generateJsCode(
     nameTables: NameTables
 ): String {
     moveBodilessDeclarationsToSeparatePlace(context, moduleFragment)
-    jsPhases.invokeToplevel(PhaseConfig(jsPhases), context, moduleFragment)
+    jsPhases.invokeToplevel(PhaseConfig(jsPhases), context, listOf(moduleFragment))
 
     val transformer = IrModuleToJsTransformer(context, null, null, true, nameTables)
     return transformer.generateModule(moduleFragment).jsCode!!

js/js.tests/test/org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.kt

@@ -580,7 +580,7 @@ class GenerateIrRuntime {
 
         ExternalDependenciesGenerator(symbolTable, listOf(jsLinker), languageVersionSettings).generateUnboundSymbolsAsDependencies()
 
-        jsPhases.invokeToplevel(phaseConfig, context, module)
+        jsPhases.invokeToplevel(phaseConfig, context, listOf(module))
 
         val transformer = IrModuleToJsTransformer(context, null, null)