K2: drop redundant ExpectActualMatchingContext.isInline

Related to KT-73785
JetBrains · Dec 12, 2024 · ca74ad2 · ca74ad2
1 parent d26ccb8
commit ca74ad2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/...c/org/jetbrains/kotlin/fir/resolve/transformers/mpp/FirExpectActualMatchingContextImpl.kt b/...c/org/jetbrains/kotlin/fir/resolve/transformers/mpp/FirExpectActualMatchingContextImpl.kt
@@ -90,10 +90,8 @@ class FirExpectActualMatchingContextImpl private constructor(
         get() = asSymbol().resolvedStatus.isCompanion
     override val RegularClassSymbolMarker.isInner: Boolean
         get() = asSymbol().resolvedStatus.isInner
-    override val RegularClassSymbolMarker.isInline: Boolean
-        get() = asSymbol().resolvedStatus.isInline
-    override val RegularClassSymbolMarker.isValue: Boolean
-        get() = asSymbol().resolvedStatus.isValue
+    override val RegularClassSymbolMarker.isInlineOrValue: Boolean
+        get() = asSymbol().resolvedStatus.let { it.isInline || it.isValue }
 
     override val RegularClassSymbolMarker.isFun: Boolean
         get() = asSymbol().resolvedStatus.isFun

diff --git a/...in/kotlin/org/jetbrains/kotlin/backend/common/actualizer/IrExpectActualMatchingContext.kt b/...in/kotlin/org/jetbrains/kotlin/backend/common/actualizer/IrExpectActualMatchingContext.kt
@@ -119,9 +119,7 @@ internal abstract class IrExpectActualMatchingContext(
         get() = asIr().isCompanion
     override val RegularClassSymbolMarker.isInner: Boolean
         get() = asIr().isInner
-    override val RegularClassSymbolMarker.isInline: Boolean
-        get() = asIr().isValue
-    override val RegularClassSymbolMarker.isValue: Boolean
+    override val RegularClassSymbolMarker.isInlineOrValue: Boolean
         get() = asIr().isValue
 
     override val RegularClassSymbolMarker.isFun: Boolean

diff --git a/...solution.common/src/org/jetbrains/kotlin/resolve/calls/mpp/AbstractExpectActualChecker.kt b/...solution.common/src/org/jetbrains/kotlin/resolve/calls/mpp/AbstractExpectActualChecker.kt
@@ -115,7 +115,7 @@ object AbstractExpectActualChecker {
 
         if (!areCompatibleClassKinds(expectClassSymbol, actualClass)) return ExpectActualCheckingCompatibility.ClassKind
 
-        if (!equalBy(expectClassSymbol, actualClass) { listOf(it.isCompanion, it.isInner, it.isInline || it.isValue) }) {
+        if (!equalBy(expectClassSymbol, actualClass) { listOf(it.isCompanion, it.isInner, it.isInlineOrValue) }) {
             return ExpectActualCheckingCompatibility.ClassModifiers
         }
 

diff --git a/...solution.common/src/org/jetbrains/kotlin/resolve/calls/mpp/ExpectActualMatchingContext.kt b/...solution.common/src/org/jetbrains/kotlin/resolve/calls/mpp/ExpectActualMatchingContext.kt
@@ -50,8 +50,7 @@ interface ExpectActualMatchingContext<T : DeclarationSymbolMarker> : TypeSystemC
 
     val RegularClassSymbolMarker.isCompanion: Boolean
     val RegularClassSymbolMarker.isInner: Boolean
-    val RegularClassSymbolMarker.isInline: Boolean
-    val RegularClassSymbolMarker.isValue: Boolean
+    val RegularClassSymbolMarker.isInlineOrValue: Boolean
     val RegularClassSymbolMarker.isFun: Boolean
     val ClassLikeSymbolMarker.typeParameters: List<TypeParameterSymbolMarker>