diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/mpp/FirExpectActualMatchingContextImpl.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/mpp/FirExpectActualMatchingContextImpl.kt index 95e1b46909a..b7e0d1d40ab 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/mpp/FirExpectActualMatchingContextImpl.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/mpp/FirExpectActualMatchingContextImpl.kt @@ -46,9 +46,6 @@ class FirExpectActualMatchingContextImpl private constructor( override val shouldCheckAbsenceOfDefaultParamsInActual: Boolean get() = true - override val enumConstructorsAreAlwaysCompatible: Boolean - get() = true - override val allowClassActualizationWithWiderVisibility: Boolean get() = true diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/actualizer/IrExpectActualMatchingContext.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/actualizer/IrExpectActualMatchingContext.kt index 4ab8abd4be5..52d5063f40b 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/actualizer/IrExpectActualMatchingContext.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/actualizer/IrExpectActualMatchingContext.kt @@ -95,9 +95,6 @@ internal abstract class IrExpectActualMatchingContext( override val innerClassesCapturesOuterTypeParameters: Boolean get() = false - override val enumConstructorsAreAlwaysCompatible: Boolean - get() = true - override val RegularClassSymbolMarker.classId: ClassId get() = asIr().classIdOrFail diff --git a/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/mpp/AbstractExpectActualChecker.kt b/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/mpp/AbstractExpectActualChecker.kt index ad27d550287..096fc968bdf 100644 --- a/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/mpp/AbstractExpectActualChecker.kt +++ b/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/mpp/AbstractExpectActualChecker.kt @@ -328,7 +328,6 @@ object AbstractExpectActualChecker { } if ( - enumConstructorsAreAlwaysCompatible && expectContainingClass?.classKind == ClassKind.ENUM_CLASS && actualContainingClass?.classKind == ClassKind.ENUM_CLASS && expectDeclaration is ConstructorSymbolMarker && diff --git a/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/mpp/AbstractExpectActualMatcher.kt b/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/mpp/AbstractExpectActualMatcher.kt index f686365e35d..2f7b9892c3a 100644 --- a/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/mpp/AbstractExpectActualMatcher.kt +++ b/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/mpp/AbstractExpectActualMatcher.kt @@ -180,7 +180,6 @@ object AbstractExpectActualMatcher { } if ( - enumConstructorsAreAlwaysCompatible && expectContainingClass?.classKind == ClassKind.ENUM_CLASS && actualContainingClass?.classKind == ClassKind.ENUM_CLASS && expectDeclaration is ConstructorSymbolMarker && diff --git a/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/mpp/ExpectActualMatchingContext.kt b/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/mpp/ExpectActualMatchingContext.kt index edcdb13f179..5d934d0ab24 100644 --- a/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/mpp/ExpectActualMatchingContext.kt +++ b/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/mpp/ExpectActualMatchingContext.kt @@ -35,9 +35,6 @@ interface ExpectActualMatchingContext : TypeSystemC val innerClassesCapturesOuterTypeParameters: Boolean get() = true - val enumConstructorsAreAlwaysCompatible: Boolean - get() = false - // Try to drop it once KT-61105 is fixed val shouldCheckAbsenceOfDefaultParamsInActual: Boolean