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

[FIR, IR] Cleanup: inline functions that have only one usage in matcher/checker

Browse Source 
Review: https://jetbrains.team/p/kt/reviews/12750/timeline
This commit is contained in:
Nikita Bobko
2023-10-26 01:34:21 +02:00
committed by teamcity
parent 92850dcc84
commit facdbfdc11
2 changed files with 7 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/mpp/AbstractExpectActualChecker.kt
+5 -37
View File
@@ -88,20 +88,7 @@ object AbstractExpectActualChecker {
expectClassSymbol: RegularClassSymbolMarker,
actualClassLikeSymbol: ClassLikeSymbolMarker,
parentSubstitutor: TypeSubstitutorMarker?,
): ExpectActualCheckingCompatibility<*> = getClassifiersIncompatibility(
expectClassSymbol,
actualClassLikeSymbol,
parentSubstitutor,
)
?: ExpectActualCheckingCompatibility.Compatible
context(ExpectActualMatchingContext<*>)
@Suppress("warnings")
private fun getClassifiersIncompatibility(
expectClassSymbol: RegularClassSymbolMarker,
actualClassLikeSymbol: ClassLikeSymbolMarker,
parentSubstitutor: TypeSubstitutorMarker?,
): ExpectActualCheckingCompatibility.Incompatible<*>? {
): ExpectActualCheckingCompatibility<*> {
// Can't check FQ names here because nested expected class may be implemented via actual typealias's expansion with the other FQ name
require(expectClassSymbol.name == actualClassLikeSymbol.name) {
"This function should be invoked only for declarations with the same name: $expectClassSymbol, $actualClassLikeSymbol"
@@ -110,7 +97,7 @@ object AbstractExpectActualChecker {
val actualClass = when (actualClassLikeSymbol) {
is RegularClassSymbolMarker -> actualClassLikeSymbol
is TypeAliasSymbolMarker -> actualClassLikeSymbol.expandToRegularClass()
?: return null // do not report extra error on erroneous typealias
?: return ExpectActualCheckingCompatibility.Compatible // do not report extra error on erroneous typealias
else -> error("Incorrect actual classifier for $expectClassSymbol: $actualClassLikeSymbol")
}
@@ -157,7 +144,7 @@ object AbstractExpectActualChecker {
getClassScopesIncompatibility(expectClassSymbol, actualClass, substitutor)?.let { return it }
return null
return ExpectActualCheckingCompatibility.Compatible
}
context(ExpectActualMatchingContext<*>)
@@ -313,26 +300,7 @@ object AbstractExpectActualChecker {
return ExpectActualCheckingCompatibility.Compatible
}
val annotationMode = expectContainingClass?.classKind == ClassKind.ANNOTATION_CLASS
return getCallablesCheckingIncompatibility(
expectDeclaration,
actualDeclaration,
annotationMode,
parentSubstitutor,
expectContainingClass,
actualContainingClass,
) ?: ExpectActualCheckingCompatibility.Compatible
}
context(ExpectActualMatchingContext<*>)
private fun getCallablesCheckingIncompatibility(
expectDeclaration: CallableSymbolMarker,
actualDeclaration: CallableSymbolMarker,
insideAnnotationClass: Boolean,
parentSubstitutor: TypeSubstitutorMarker?,
expectContainingClass: RegularClassSymbolMarker?,
actualContainingClass: RegularClassSymbolMarker?,
): ExpectActualCheckingCompatibility.Incompatible<*>? {
val insideAnnotationClass = expectContainingClass?.classKind == ClassKind.ANNOTATION_CLASS
val expectedTypeParameters = expectDeclaration.typeParameters
val actualTypeParameters = actualDeclaration.typeParameters
val expectedValueParameters = expectDeclaration.valueParameters
@@ -425,7 +393,7 @@ object AbstractExpectActualChecker {
else -> error("Unsupported declarations: $expectDeclaration, $actualDeclaration")
}
return null
return ExpectActualCheckingCompatibility.Compatible
}
context(ExpectActualMatchingContext<*>)
compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/mpp/AbstractExpectActualMatcher.kt
+2 -12
View File
@@ -170,18 +170,8 @@ object AbstractExpectActualMatcher {
return ExpectActualMatchingCompatibility.MatchedSuccessfully
}
val annotationMode = expectContainingClass?.classKind == ClassKind.ANNOTATION_CLASS
return getCallablesMatchingIncompatibility(expectDeclaration, actualDeclaration, annotationMode, parentSubstitutor)
?: ExpectActualMatchingCompatibility.MatchedSuccessfully
}
val insideAnnotationClass = expectContainingClass?.classKind == ClassKind.ANNOTATION_CLASS
context(ExpectActualMatchingContext<*>)
private fun getCallablesMatchingIncompatibility(
expectDeclaration: CallableSymbolMarker,
actualDeclaration: CallableSymbolMarker,
insideAnnotationClass: Boolean,
parentSubstitutor: TypeSubstitutorMarker?,
): ExpectActualMatchingCompatibility.Mismatch? {
if (expectDeclaration is FunctionSymbolMarker != actualDeclaration is FunctionSymbolMarker) {
return ExpectActualMatchingCompatibility.CallableKind
}
@@ -228,7 +218,7 @@ object AbstractExpectActualMatcher {
return ExpectActualMatchingCompatibility.FunctionTypeParameterUpperBounds
}
return null
return ExpectActualMatchingCompatibility.MatchedSuccessfully
}
context(ExpectActualMatchingContext<*>)