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

K2: drop unnecessary attributes when inferring declaration types

Browse Source 
Related to KT-62578
This commit is contained in:
Mikhail Glukhikh
2023-10-17 13:44:40 +02:00
committed by Space Team
parent 90eaf5f70f
commit cebb6747e3
5 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/DeclarationApproximationUtils.kt
+12 -1
View File
@@ -30,10 +30,21 @@ fun FirTypeRef.approximateDeclarationType(
}
val preparedType = if (isLocal) baseType else baseType.substituteAlternativesInPublicType(session)
val approximatedType = session.typeApproximator.approximateToSuperType(preparedType, configuration) ?: preparedType
var approximatedType = session.typeApproximator.approximateToSuperType(preparedType, configuration) ?: preparedType
if (approximatedType.contains { type -> type.attributes.any { !it.keepInInferredDeclarationType } }) {
approximatedType = UnnecessaryAttributesRemover(session).substituteOrSelf(approximatedType)
}
return this.withReplacedConeType(approximatedType).applyIf(stripEnhancedNullability) { withoutEnhancedNullability() }
}
private class UnnecessaryAttributesRemover(session: FirSession) : AbstractConeSubstitutor(session.typeContext) {
override fun substituteType(type: ConeKotlinType): ConeKotlinType? {
val filteredAttributes = type.attributes.filterNecessaryToKeep()
return if (filteredAttributes === type.attributes) null
else type.withAttributes(filteredAttributes)
}
}
private fun ConeKotlinType.substituteAlternativesInPublicType(session: FirSession): ConeKotlinType {
val substitutor = object : AbstractConeSubstitutor(session.typeContext) {
override fun substituteType(type: ConeKotlinType): ConeKotlinType? {