HMPP: Avoid false positive detection of "common native" as "common"

JetBrains · Apr 14, 2020 · 0f60b5a · 0f60b5a
1 parent b108b0f
commit 0f60b5a
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/core/descriptors/src/org/jetbrains/kotlin/platform/TargetPlatform.kt b/core/descriptors/src/org/jetbrains/kotlin/platform/TargetPlatform.kt
@@ -77,7 +77,13 @@ interface TargetPlatformVersion {
     }
 }
 
-fun TargetPlatform?.isCommon(): Boolean = this != null && this.size > 1
+fun TargetPlatform?.isCommon(): Boolean = this != null && size > 1 && iterator().let { i ->
+    val firstPlatformName = i.next().platformName
+    while (i.hasNext()) {
+        if (i.next().platformName != firstPlatformName) return@let true
+    }
+    false
+}
 
 fun SimplePlatform.toTargetPlatform(): TargetPlatform = TargetPlatform(setOf(this))