From 9a1d9814de5c54bce6001b4f2b87e4580aac2adc Mon Sep 17 00:00:00 2001
From: Anton Bannykh <anton.bannykh@jetbrains.com>
Date: Wed, 3 Jun 2020 14:49:04 +0300
Subject: [PATCH] Simpify phase building

---
 .../kotlin/ir/backend/js/JsLoweringPhases.kt  | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt
index 8953648aadf..0df9d2e568d 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt
@@ -33,19 +33,22 @@ private fun makeJsModulePhase(
     name: String,
     description: String,
     prerequisite: Set<AnyNamedPhase> = emptySet()
-) = makeIrModulePhase<JsIrBackendContext>(lowering, name, description, prerequisite, actions = setOf(validationAction, defaultDumper))
+) = makeCustomJsModulePhase(
+    op = { context, moduleFragment -> lowering(context).lower(moduleFragment) },
+    name = name,
+    description = description,
+    prerequisite = prerequisite
+)
 
 private fun makeCustomJsModulePhase(
     op: (JsIrBackendContext, IrModuleFragment) -> Unit,
     description: String,
     name: String,
     prerequisite: Set<AnyNamedPhase> = emptySet()
-) = namedIrModulePhase(
-    name,
-    description,
-    prerequisite,
-    actions = setOf(defaultDumper, validationAction),
-    nlevels = 0,
+) = SameTypeNamedPhaseWrapper(
+    name = name,
+    description = description,
+    prerequisite = prerequisite,
     lower = object : SameTypeCompilerPhase<JsIrBackendContext, IrModuleFragment> {
         override fun invoke(
             phaseConfig: PhaseConfig,
@@ -56,7 +59,12 @@ private fun makeCustomJsModulePhase(
             op(context, input)
             return input
         }
-    }
+    },
+    preconditions = emptySet(),
+    postconditions = emptySet(),
+    stickyPostconditions = emptySet(),
+    actions = setOf(defaultDumper, validationAction),
+    nlevels = 0
 )
 
 sealed class Lowering(val name: String) {