From a2e2213d310897ffb13a40c036504aff094fb4fe Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Tue, 31 Mar 2020 13:49:49 +0700
Subject: [PATCH] Keep KonanTarget.predefinedTargets as Map<String,
 KonanTarget>

---
 .../src/org/jetbrains/kotlin/konan/target/HostManager.kt    | 2 +-
 .../src/org/jetbrains/kotlin/konan/target/KonanTarget.kt    | 6 +++---
 .../org/jetbrains/kotlin/konan/target/KonanTargetTest.kt    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt
index a35068e16c2..b670c89381a 100644
--- a/native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt
+++ b/native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt
@@ -16,7 +16,7 @@ open class HostManager(protected val distribution: Distribution = Distribution()
     private val experimentalEnabled = experimental || distribution.experimentalEnabled
     private val configurableSubtargets = zephyrSubtargets
 
-    val targetValues: List<KonanTarget> by lazy { KonanTarget.predefinedTargets.toList() + configurableSubtargets }
+    val targetValues: List<KonanTarget> by lazy { KonanTarget.predefinedTargets.values + configurableSubtargets }
 
     val targets = targetValues.associateBy { it.visibleName }
 
diff --git a/native/utils/src/org/jetbrains/kotlin/konan/target/KonanTarget.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/KonanTarget.kt
index 0fee31a7b20..5b06f22c44f 100644
--- a/native/utils/src/org/jetbrains/kotlin/konan/target/KonanTarget.kt
+++ b/native/utils/src/org/jetbrains/kotlin/konan/target/KonanTarget.kt
@@ -39,8 +39,8 @@ sealed class KonanTarget(override val name: String, val family: Family, val arch
 
     companion object {
         // TODO: need a better way to enumerated predefined targets.
-        val predefinedTargets by lazy {
-            setOf(
+        val predefinedTargets: Map<String, KonanTarget> by lazy {
+            listOf(
                 ANDROID_X64, ANDROID_X86, ANDROID_ARM32, ANDROID_ARM64,
                 IOS_ARM32, IOS_ARM64, IOS_X64,
                 WATCHOS_ARM32, WATCHOS_ARM64, WATCHOS_X86, WATCHOS_X64,
@@ -50,7 +50,7 @@ sealed class KonanTarget(override val name: String, val family: Family, val arch
                 MACOS_X64,
                 LINUX_ARM64, LINUX_ARM32_HFP, LINUX_MIPS32, LINUX_MIPSEL32,
                 WASM32
-            )
+            ).associateBy { it.name }
         }
     }
 }
diff --git a/native/utils/tests/org/jetbrains/kotlin/konan/target/KonanTargetTest.kt b/native/utils/tests/org/jetbrains/kotlin/konan/target/KonanTargetTest.kt
index 3d52b5c9a4a..8526755de88 100644
--- a/native/utils/tests/org/jetbrains/kotlin/konan/target/KonanTargetTest.kt
+++ b/native/utils/tests/org/jetbrains/kotlin/konan/target/KonanTargetTest.kt
@@ -14,7 +14,7 @@ class KonanTargetTest {
         assertEquals(
             "Some of predefined KonanTarget instances are not listed in 'KonanTarget.predefinedTargets'",
             KonanTarget::class.sealedSubclasses.mapNotNull { it.objectInstance }.toSet(),
-            KonanTarget.predefinedTargets
+            KonanTarget.predefinedTargets.values.toSet()
         )
     }
 }