From 24ac122e88f8b7a4f34d4310eb330ff6ca0a65e1 Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Wed, 15 Sep 2021 14:11:31 +0200
Subject: [PATCH] [Commonizer] CirTypeDistance: Use property for 'unreachable'

^KT-48288
---
 .../commonizer/mergedtree/CirTypeDistance.kt  | 12 +++++-----
 .../kotlin/commonizer/CirTypeDistanceTest.kt  | 23 ++++++++++---------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirTypeDistance.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirTypeDistance.kt
index bb310560960..038531884f7 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirTypeDistance.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirTypeDistance.kt
@@ -55,7 +55,7 @@ value class CirTypeDistance(private val value: Int) : Comparable<CirTypeDistance
     }
 
     companion object {
-        fun unreachable(): CirTypeDistance = CirTypeDistance(Int.MAX_VALUE)
+        val unreachable: CirTypeDistance = CirTypeDistance(Int.MAX_VALUE)
     }
 }
 
@@ -87,14 +87,14 @@ internal fun typeDistance(
 }
 
 private fun forwardTypeDistance(from: CirClassOrTypeAliasType, to: CirEntityId): CirTypeDistance {
-    if (from !is CirTypeAliasType) return unreachable()
+    if (from !is CirTypeAliasType) return unreachable
 
     var iteration = 0
     var underlyingType: CirClassOrTypeAliasType? = from.underlyingType
 
     while (true) {
         iteration++
-        val capturedUnderlyingType = underlyingType ?: return unreachable()
+        val capturedUnderlyingType = underlyingType ?: return unreachable
         if (capturedUnderlyingType.classifierId == to) return CirTypeDistance(iteration)
         underlyingType = (capturedUnderlyingType as? CirTypeAliasType)?.underlyingType
     }
@@ -109,14 +109,14 @@ private fun backwardsTypeDistance(
         return classifiers.backwardsTypeDistance(targetIndex, from, resolvedDependencyClassifier)
     }
 
-    val resolvedClassifier = classifiers.classifierIndices[targetIndex].findClassifier(to) ?: return unreachable()
+    val resolvedClassifier = classifiers.classifierIndices[targetIndex].findClassifier(to) ?: return unreachable
     return classifiers.backwardsTypeDistance(targetIndex, from, resolvedClassifier)
 }
 
 private fun CirKnownClassifiers.backwardsTypeDistance(
     targetIndex: Int, from: CirEntityId, to: CirProvided.Classifier
 ): CirTypeDistance {
-    if (to !is CirProvided.TypeAlias) return unreachable()
+    if (to !is CirProvided.TypeAlias) return unreachable
     if (to.underlyingType.classifierId == from) return CirTypeDistance(-1)
     return backwardsTypeDistance(this, targetIndex, from, to.underlyingType.classifierId) - 1
 }
@@ -124,7 +124,7 @@ private fun CirKnownClassifiers.backwardsTypeDistance(
 private fun CirKnownClassifiers.backwardsTypeDistance(
     targetIndex: Int, from: CirEntityId, to: CirClassifier
 ): CirTypeDistance {
-    if (to !is CirTypeAlias) return unreachable()
+    if (to !is CirTypeAlias) return unreachable
     if (to.underlyingType.classifierId == from) return CirTypeDistance(-1)
     return backwardsTypeDistance(this, targetIndex, from, to.underlyingType.classifierId) - 1
 }
\ No newline at end of file
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/commonizer/CirTypeDistanceTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/CirTypeDistanceTest.kt
index 31416d1179c..83e1970ce30 100644
--- a/native/commonizer/tests/org/jetbrains/kotlin/commonizer/CirTypeDistanceTest.kt
+++ b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/CirTypeDistanceTest.kt
@@ -299,21 +299,22 @@ class CirTypeDistanceTest : KtInlineSourceCommonizerTestCase() {
     }
 
     fun `test unreachable distance`() {
-        assertUnreachable(CirTypeDistance.unreachable() + CirTypeDistance.unreachable())
-        assertUnreachable(CirTypeDistance.unreachable() + 1)
-        assertUnreachable(CirTypeDistance.unreachable().inc())
-        assertUnreachable(CirTypeDistance.unreachable() + CirTypeDistance(1))
-        assertUnreachable(CirTypeDistance(1) + CirTypeDistance.unreachable())
-        assertUnreachable(CirTypeDistance.unreachable() - 1)
-        assertUnreachable(CirTypeDistance.unreachable().dec())
-        assertUnreachable(CirTypeDistance.unreachable() - CirTypeDistance(1))
-        assertUnreachable(CirTypeDistance(1) - CirTypeDistance.unreachable())
-        assertUnreachable(CirTypeDistance.unreachable().absoluteValue)
+        assertUnreachable(CirTypeDistance.unreachable + CirTypeDistance.unreachable)
+        assertUnreachable(CirTypeDistance.unreachable + 1)
+        assertUnreachable(CirTypeDistance.unreachable.inc())
+        assertUnreachable(CirTypeDistance.unreachable + CirTypeDistance(1))
+        assertUnreachable(CirTypeDistance(1) + CirTypeDistance.unreachable)
+        assertUnreachable(CirTypeDistance.unreachable - 1)
+        assertUnreachable(CirTypeDistance.unreachable.dec())
+        assertUnreachable(CirTypeDistance.unreachable - CirTypeDistance(1))
+        assertUnreachable(CirTypeDistance(1) - CirTypeDistance.unreachable)
+        assertUnreachable(CirTypeDistance.unreachable.absoluteValue)
+        assertEquals(CirTypeDistance(Int.MAX_VALUE), CirTypeDistance.unreachable)
     }
 }
 
 private fun assertUnreachable(typeDistance: CirTypeDistance) {
-    assertEquals(CirTypeDistance.unreachable(), typeDistance)
+    assertEquals(CirTypeDistance.unreachable, typeDistance)
     assertTrue(typeDistance.isNotReachable)
     assertFalse(typeDistance.isReachable)
     assertFalse(typeDistance.isPositive)