From e627f086145f8ac5d670cd3b007dd28a49616f8b Mon Sep 17 00:00:00 2001
From: Georgy Bronnikov <georgy.bronnikov@jetbrains.com>
Date: Thu, 21 Mar 2019 20:43:36 +0300
Subject: [PATCH] Make wrong phase name an error

---
 .../kotlin/cli/common/createPhaseConfig.kt    | 26 +++++++++----------
 .../testData/cli/jvm/nonExistingPhaseName.out |  6 ++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/createPhaseConfig.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/common/createPhaseConfig.kt
index eae4f57b8e5..5b71e8eb88a 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/createPhaseConfig.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/createPhaseConfig.kt
@@ -18,20 +18,20 @@ fun createPhaseConfig(
     arguments: CommonCompilerArguments,
     messageCollector: MessageCollector
 ): PhaseConfig {
-    fun warn(message: String) = messageCollector.report(CompilerMessageSeverity.WARNING, message)
+    fun report(message: String) = messageCollector.report(CompilerMessageSeverity.ERROR, message)
 
     val phases = compoundPhase.toPhaseMap()
-    val enabled = computeEnabled(phases, arguments.disablePhases, ::warn).toMutableSet()
-    val verbose = phaseSetFromArguments(phases, arguments.verbosePhases, ::warn)
+    val enabled = computeEnabled(phases, arguments.disablePhases, ::report).toMutableSet()
+    val verbose = phaseSetFromArguments(phases, arguments.verbosePhases, ::report)
 
-    val beforeDumpSet = phaseSetFromArguments(phases, arguments.phasesToDumpBefore, ::warn)
-    val afterDumpSet = phaseSetFromArguments(phases, arguments.phasesToDumpAfter, ::warn)
-    val bothDumpSet = phaseSetFromArguments(phases, arguments.phasesToDump, ::warn)
+    val beforeDumpSet = phaseSetFromArguments(phases, arguments.phasesToDumpBefore, ::report)
+    val afterDumpSet = phaseSetFromArguments(phases, arguments.phasesToDumpAfter, ::report)
+    val bothDumpSet = phaseSetFromArguments(phases, arguments.phasesToDump, ::report)
     val toDumpStateBefore = beforeDumpSet + bothDumpSet
     val toDumpStateAfter = afterDumpSet + bothDumpSet
-    val beforeValidateSet = phaseSetFromArguments(phases, arguments.phasesToValidateBefore, ::warn)
-    val afterValidateSet = phaseSetFromArguments(phases, arguments.phasesToValidateAfter, ::warn)
-    val bothValidateSet = phaseSetFromArguments(phases, arguments.phasesToValidate, ::warn)
+    val beforeValidateSet = phaseSetFromArguments(phases, arguments.phasesToValidateBefore, ::report)
+    val afterValidateSet = phaseSetFromArguments(phases, arguments.phasesToValidateAfter, ::report)
+    val bothValidateSet = phaseSetFromArguments(phases, arguments.phasesToValidate, ::report)
     val toValidateStateBefore = beforeValidateSet + bothValidateSet
     val toValidateStateAfter = afterValidateSet + bothValidateSet
 
@@ -55,22 +55,22 @@ fun createPhaseConfig(
 private fun computeEnabled(
     phases: MutableMap<String, AnyNamedPhase>,
     namesOfDisabled: Array<String>?,
-    warn: (String) -> Unit
+    report: (String) -> Unit
 ): Set<AnyNamedPhase> {
-    val disabledPhases = phaseSetFromArguments(phases, namesOfDisabled, warn)
+    val disabledPhases = phaseSetFromArguments(phases, namesOfDisabled, report)
     return phases.values.toSet() - disabledPhases
 }
 
 private fun phaseSetFromArguments(
     phases: MutableMap<String, AnyNamedPhase>,
     names: Array<String>?,
-    warn: (String) -> Unit
+    report: (String) -> Unit
 ): Set<AnyNamedPhase> {
     if (names == null) return emptySet()
     if ("ALL" in names) return phases.values.toSet()
     return names.mapNotNull {
         phases[it] ?: run {
-            warn("no phase named $it, ignoring")
+            report("no phase named $it")
             null
         }
     }.toSet()
diff --git a/compiler/testData/cli/jvm/nonExistingPhaseName.out b/compiler/testData/cli/jvm/nonExistingPhaseName.out
index 51a1af33d94..bc6cb62b814 100644
--- a/compiler/testData/cli/jvm/nonExistingPhaseName.out
+++ b/compiler/testData/cli/jvm/nonExistingPhaseName.out
@@ -1,3 +1,3 @@
-warning: no phase named qz, ignoring
-warning: no phase named qq, ignoring
-OK
+error: no phase named qz
+error: no phase named qq
+COMPILATION_ERROR