diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirConflictsChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirConflictsChecker.kt index df1e2979a77..77139b2ae29 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirConflictsChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirConflictsChecker.kt @@ -84,7 +84,7 @@ object FirConflictsChecker : FirBasicDeclarationChecker() { ) { conflictingSymbol.ensureResolved(FirResolvePhase.STATUS) @OptIn(SymbolInternals::class) - val conflicting = conflictingSymbol.fir as? FirDeclaration ?: return + val conflicting = conflictingSymbol.fir if (declaration.moduleData != conflicting.moduleData) return val actualConflictingPresentation = conflictingPresentation ?: presenter.represent(conflicting) if (conflicting == declaration || actualConflictingPresentation != declarationPresentation) return diff --git a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/calls/Synthetics.kt b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/calls/Synthetics.kt index 9e913ecb976..1cf6268f50d 100644 --- a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/calls/Synthetics.kt +++ b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/calls/Synthetics.kt @@ -85,9 +85,9 @@ class FirSyntheticPropertiesScope( var matchingSetter: FirSimpleFunction? = null if (getterReturnType != null) { val setterName = syntheticNamesProvider.setterNameByGetterName(getterName) - baseScope.processFunctionsByName(setterName, fun(setterSymbol: FirFunctionSymbol<*>) { + baseScope.processFunctionsByName(setterName, fun(setterSymbol: FirNamedFunctionSymbol) { if (matchingSetter != null) return - val setter = setterSymbol.fir as? FirSimpleFunction ?: return + val setter = setterSymbol.fir val parameter = setter.valueParameters.singleOrNull() ?: return if (setter.typeParameters.isNotEmpty() || setter.isStatic) return val parameterType = (parameter.returnTypeRef as? FirResolvedTypeRef)?.type ?: return diff --git a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirStaticScope.kt b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirStaticScope.kt index 51c0a998418..c98f31397c4 100644 --- a/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirStaticScope.kt +++ b/compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirStaticScope.kt @@ -5,8 +5,6 @@ package org.jetbrains.kotlin.fir.scopes.impl -import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration -import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction import org.jetbrains.kotlin.fir.declarations.utils.isStatic import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor import org.jetbrains.kotlin.fir.scopes.FirContainingNamesAwareScope @@ -22,7 +20,7 @@ class FirStaticScope(private val delegateScope: FirContainingNamesAwareScope) : override fun processFunctionsByName(name: Name, processor: (FirNamedFunctionSymbol) -> Unit) { delegateScope.processFunctionsByName(name) { - if ((it.fir as? FirSimpleFunction)?.isStatic == true) { + if (it.fir.isStatic) { processor(it) } } @@ -30,7 +28,7 @@ class FirStaticScope(private val delegateScope: FirContainingNamesAwareScope) : override fun processPropertiesByName(name: Name, processor: (FirVariableSymbol<*>) -> Unit) { delegateScope.processPropertiesByName(name) { - if ((it.fir as? FirCallableDeclaration)?.isStatic == true) { + if (it.fir.isStatic) { processor(it) } }