azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR] Extract isRefinementUseless() to casting helpers

Browse Source
This commit is contained in:
Nikolay Lunyak
2024-02-28 15:15:33 +02:00
committed by Space Team
parent fab6cec93a
commit 116ff60325
2 changed files with 48 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirCastDiagnosticsHelpers.kt
+40
View File
@@ -7,9 +7,11 @@ package org.jetbrains.kotlin.fir.analysis.checkers
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
import org.jetbrains.kotlin.fir.declarations.utils.isLocal
import org.jetbrains.kotlin.fir.expressions.*
import org.jetbrains.kotlin.fir.resolve.defaultType
import org.jetbrains.kotlin.fir.resolve.getClassAndItsOuterClassesWhenLocal
import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutorByMap
import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol
import org.jetbrains.kotlin.fir.types.*
@@ -177,3 +179,41 @@ fun isUpcast(context: CheckerContext, candidateType: ConeKotlinType, targetType:
// If one casts p1 to p2 (or vice versa), it is _not_ up cast, i.e., not redundant, yet meaningful.
return candidateType.isExtensionFunctionType == targetType.isExtensionFunctionType
}
internal fun isRefinementUseless(
context: CheckerContext,
lhsType: ConeSimpleKotlinType,
targetType: ConeKotlinType,
expression: FirTypeOperatorCall,
arg: FirExpression,
): Boolean {
return when (expression.operation) {
FirOperation.AS, FirOperation.SAFE_AS -> {
if (arg is FirFunctionCall) {
val functionSymbol = arg.toResolvedCallableSymbol(context.session) as? FirFunctionSymbol<*>
if (functionSymbol != null && functionSymbol.isFunctionForExpectTypeFromCastFeature()) return false
}
// Normalize `targetType` for cases like the following:
// fun f(x: Int?) { x as? Int } // USELESS_CAST is reasonable here
val refinedTargetType =
if (expression.operation == FirOperation.SAFE_AS && lhsType.isNullable) {
targetType.withNullability(ConeNullability.NULLABLE, context.session.typeContext)
} else {
targetType
}
isExactTypeCast(context, lhsType, refinedTargetType)
}
FirOperation.IS, FirOperation.NOT_IS -> {
isUpcast(context, lhsType, targetType)
}
else -> throw AssertionError("Should not be here: ${expression.operation}")
}
}
private fun isExactTypeCast(context: CheckerContext, lhsType: ConeSimpleKotlinType, targetType: ConeKotlinType): Boolean {
if (!AbstractTypeChecker.equalTypes(context.session.typeContext, lhsType, targetType, stubTypesEqualToAnything = false))
return false
// See comments at [isUpcast] why we need to check the existence of @ExtensionFunctionType
return lhsType.isExtensionFunctionType == targetType.isExtensionFunctionType
}
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirUselessTypeOperationCallChecker.kt
+8 -44
View File
@@ -9,14 +9,16 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
import org.jetbrains.kotlin.diagnostics.reportOn
import org.jetbrains.kotlin.fir.analysis.checkers.MppCheckerKind
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
import org.jetbrains.kotlin.fir.analysis.checkers.isFunctionForExpectTypeFromCastFeature
import org.jetbrains.kotlin.fir.analysis.checkers.isUpcast
import org.jetbrains.kotlin.fir.analysis.checkers.isRefinementUseless
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
import org.jetbrains.kotlin.fir.expressions.*
import org.jetbrains.kotlin.fir.expressions.FirOperation
import org.jetbrains.kotlin.fir.expressions.FirTypeOperatorCall
import org.jetbrains.kotlin.fir.expressions.argument
import org.jetbrains.kotlin.fir.resolve.fullyExpandedType
import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
import org.jetbrains.kotlin.fir.types.*
import org.jetbrains.kotlin.types.AbstractTypeChecker
import org.jetbrains.kotlin.fir.types.ConeErrorType
import org.jetbrains.kotlin.fir.types.coneType
import org.jetbrains.kotlin.fir.types.resolvedType
import org.jetbrains.kotlin.fir.types.upperBoundIfFlexible
object FirUselessTypeOperationCallChecker : FirTypeOperatorCallChecker(MppCheckerKind.Common) {
override fun check(expression: FirTypeOperatorCall, context: CheckerContext, reporter: DiagnosticReporter) {
@@ -42,42 +44,4 @@ object FirUselessTypeOperationCallChecker : FirTypeOperatorCallChecker(MppChecke
}
}
}
private fun isRefinementUseless(
context: CheckerContext,
lhsType: ConeSimpleKotlinType,
targetType: ConeKotlinType,
expression: FirTypeOperatorCall,
arg: FirExpression,
): Boolean {
return when (expression.operation) {
FirOperation.AS, FirOperation.SAFE_AS -> {
if (arg is FirFunctionCall) {
val functionSymbol = arg.toResolvedCallableSymbol(context.session) as? FirFunctionSymbol<*>
if (functionSymbol != null && functionSymbol.isFunctionForExpectTypeFromCastFeature()) return false
}
// Normalize `targetType` for cases like the following:
// fun f(x: Int?) { x as? Int } // USELESS_CAST is reasonable here
val refinedTargetType =
if (expression.operation == FirOperation.SAFE_AS && lhsType.isNullable) {
targetType.withNullability(ConeNullability.NULLABLE, context.session.typeContext)
} else {
targetType
}
isExactTypeCast(context, lhsType, refinedTargetType)
}
FirOperation.IS, FirOperation.NOT_IS -> {
isUpcast(context, lhsType, targetType)
}
else -> throw AssertionError("Should not be here: ${expression.operation}")
}
}
private fun isExactTypeCast(context: CheckerContext, lhsType: ConeSimpleKotlinType, targetType: ConeKotlinType): Boolean {
if (!AbstractTypeChecker.equalTypes(context.session.typeContext, lhsType, targetType, stubTypesEqualToAnything = false))
return false
// See comments at [isUpcast] why we need to check the existence of @ExtensionFunctionType
return lhsType.isExtensionFunctionType == targetType.isExtensionFunctionType
}
}