diff --git a/compiler/fir/checkers/checkers.js/src/org/jetbrains/kotlin/fir/analysis/js/checkers/declaration/FirJsMultipleInheritanceChecker.kt b/compiler/fir/checkers/checkers.js/src/org/jetbrains/kotlin/fir/analysis/js/checkers/declaration/FirJsMultipleInheritanceChecker.kt index 790b1ca7e3c..c541250aca3 100644 --- a/compiler/fir/checkers/checkers.js/src/org/jetbrains/kotlin/fir/analysis/js/checkers/declaration/FirJsMultipleInheritanceChecker.kt +++ b/compiler/fir/checkers/checkers.js/src/org/jetbrains/kotlin/fir/analysis/js/checkers/declaration/FirJsMultipleInheritanceChecker.kt @@ -51,8 +51,7 @@ object FirJsMultipleInheritanceChecker : FirClassChecker() { val overridesWithSameName = scope.getFunctions(functionToCheck) for (function in overridesWithSameName) { - val overridden = function.overriddenFunctions(symbol, context, memberRequiredPhase = null) - + val overridden = function.overriddenFunctions(symbol, context) if ( overridden.size > 1 && overridden.any { it.callableId.classId == supertype.classId } diff --git a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirJvmInconsistentOperatorFromJavaCallChecker.kt b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirJvmInconsistentOperatorFromJavaCallChecker.kt index c77d1e780ce..69a0e3b33cf 100644 --- a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirJvmInconsistentOperatorFromJavaCallChecker.kt +++ b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirJvmInconsistentOperatorFromJavaCallChecker.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -62,7 +62,7 @@ object FirJvmInconsistentOperatorFromJavaCallChecker : FirFunctionCallChecker() // Check explicitly overridden contains val containingClass = containingClassLookupTag()?.toFirRegularClassSymbol(context.session) ?: return false - val overriddenFunctions = overriddenFunctions(containingClass, context, memberRequiredPhase = null) + val overriddenFunctions = overriddenFunctions(containingClass, context) for (overriddenFunction in overriddenFunctions) { if (overriddenFunction is FirNamedFunctionSymbol && overriddenFunction.check(source, context, reporter)) { return true diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt index 812390aae3f..0cde61c1324 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt @@ -191,17 +191,15 @@ fun CheckerContext.findClosestClassOrObject(): FirClass? { fun FirSimpleFunction.overriddenFunctions( containingClass: FirClassSymbol<*>, context: CheckerContext, - memberRequiredPhase: FirResolvePhase?, ): List> { - return symbol.overriddenFunctions(containingClass, context, memberRequiredPhase) + return symbol.overriddenFunctions(containingClass, context) } fun FirNamedFunctionSymbol.overriddenFunctions( containingClass: FirClassSymbol<*>, context: CheckerContext, - memberRequiredPhase: FirResolvePhase?, ): List> { - return overriddenFunctions(containingClass, context.session, context.scopeSession, memberRequiredPhase) + return overriddenFunctions(containingClass, context.session, context.scopeSession) } fun FirClass.collectSupertypesWithDelegates(): Map { diff --git a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/declarations/OperatorFunctionChecks.kt b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/declarations/OperatorFunctionChecks.kt index 5d4378f79f4..5c908538d2e 100644 --- a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/declarations/OperatorFunctionChecks.kt +++ b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/declarations/OperatorFunctionChecks.kt @@ -92,7 +92,7 @@ object OperatorFunctionChecks { val containingClassSymbol = function.containingClassLookupTag()?.toFirRegularClassSymbol(session) ?: return null val customEqualsSupported = session.languageVersionSettings.supportsFeature(LanguageFeature.CustomEqualsInValueClasses) - if (function.symbol.overriddenFunctions(containingClassSymbol, session, scopeSession, memberRequiredPhase = null) + if (function.symbol.overriddenFunctions(containingClassSymbol, session, scopeSession) .any { it.containingClassLookupTag()?.classId == StandardClassIds.Any } || (customEqualsSupported && function.isTypedEqualsInValueClass(session)) ) { diff --git a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/Scopes.kt b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/Scopes.kt index 02f39f6b85f..8bf1182180c 100644 --- a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/Scopes.kt +++ b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/Scopes.kt @@ -60,13 +60,12 @@ fun FirNamedFunctionSymbol.overriddenFunctions( containingClass: FirClassSymbol<*>, session: FirSession, scopeSession: ScopeSession, - memberRequiredPhase: FirResolvePhase?, ): List> { val firTypeScope = containingClass.unsubstitutedScope( session, scopeSession, withForcedTypeCalculator = true, - memberRequiredPhase = memberRequiredPhase, + memberRequiredPhase = FirResolvePhase.STATUS, ) val overriddenFunctions = mutableListOf>()