From 81529a835bace2becce71817cf2efc921e835fec Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 15 Oct 2020 12:15:50 +0300 Subject: [PATCH] Drop FirAbstractOverrideChecker.isEqualTypes --- .../org/jetbrains/kotlin/fir/java/scopes/JavaOverrideChecker.kt | 2 +- .../kotlin/fir/scopes/impl/FirAbstractOverrideChecker.kt | 2 -- .../kotlin/fir/scopes/impl/FirStandardOverrideChecker.kt | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaOverrideChecker.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaOverrideChecker.kt index 1c0d6783b3b..735530875fe 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaOverrideChecker.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaOverrideChecker.kt @@ -37,7 +37,7 @@ class JavaOverrideChecker internal constructor( } } - override fun isEqualTypes(candidateTypeRef: FirTypeRef, baseTypeRef: FirTypeRef, substitutor: ConeSubstitutor) = + private fun isEqualTypes(candidateTypeRef: FirTypeRef, baseTypeRef: FirTypeRef, substitutor: ConeSubstitutor) = isEqualTypes( candidateTypeRef.toConeKotlinTypeProbablyFlexible(session, javaTypeParameterStack), baseTypeRef.toConeKotlinTypeProbablyFlexible(session, javaTypeParameterStack), diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirAbstractOverrideChecker.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirAbstractOverrideChecker.kt index 80c5c333fda..6a6613c9aa9 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirAbstractOverrideChecker.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirAbstractOverrideChecker.kt @@ -14,8 +14,6 @@ import org.jetbrains.kotlin.fir.types.impl.ConeTypeParameterTypeImpl abstract class FirAbstractOverrideChecker : FirOverrideChecker { - protected abstract fun isEqualTypes(candidateTypeRef: FirTypeRef, baseTypeRef: FirTypeRef, substitutor: ConeSubstitutor): Boolean - protected abstract fun buildTypeParametersSubstitutorIfCompatible( overrideCandidate: FirCallableMemberDeclaration<*>, baseDeclaration: FirCallableMemberDeclaration<*> diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirStandardOverrideChecker.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirStandardOverrideChecker.kt index dc50ddd3560..ec62dfa1ce6 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirStandardOverrideChecker.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirStandardOverrideChecker.kt @@ -51,7 +51,7 @@ class FirStandardOverrideChecker(session: FirSession) : FirAbstractOverrideCheck else -> this } - override fun isEqualTypes(candidateTypeRef: FirTypeRef, baseTypeRef: FirTypeRef, substitutor: ConeSubstitutor) = + fun isEqualTypes(candidateTypeRef: FirTypeRef, baseTypeRef: FirTypeRef, substitutor: ConeSubstitutor) = isEqualTypes(candidateTypeRef.coneType, baseTypeRef.coneType, substitutor)