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

K2: Don't use FirTypeParameterSymbol.resolvedBounds() from inference

Browse Source
This commit is contained in:
Mikhail Glukhikh
2022-11-18 18:37:09 +01:00
committed by Space Team
parent e57521ed23
commit df5aa59185
7 changed files with 464 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/providers/src/org/jetbrains/kotlin/fir/types/ConeTypeContext.kt
+9 -6
View File
@@ -281,7 +281,7 @@ interface ConeTypeContext : TypeSystemContext, TypeSystemOptimizationContext, Ty
return when (this) {
is ConeStubTypeConstructor -> listOf(session.builtinTypes.nullableAnyType.type)
is ConeTypeVariableTypeConstructor -> emptyList()
is ConeTypeParameterLookupTag -> symbol.resolvedBounds.map { it.coneType }
is ConeTypeParameterLookupTag -> bounds().map { it.coneType }
is ConeClassLikeLookupTag -> {
when (val symbol = toClassLikeSymbol().also { it?.lazyResolveToPhase(FirResolvePhase.TYPES) }) {
is FirClassSymbol<*> -> symbol.fir.superConeTypes
@@ -315,17 +315,17 @@ interface ConeTypeContext : TypeSystemContext, TypeSystemOptimizationContext, Ty
override fun TypeParameterMarker.upperBoundCount(): Int {
require(this is ConeTypeParameterLookupTag)
return this.symbol.resolvedBounds.size
return this.bounds().size
}
override fun TypeParameterMarker.getUpperBound(index: Int): KotlinTypeMarker {
require(this is ConeTypeParameterLookupTag)
return this.symbol.resolvedBounds[index].coneType
return this.bounds()[index].coneType
}
override fun TypeParameterMarker.getUpperBounds(): List<KotlinTypeMarker> {
require(this is ConeTypeParameterLookupTag)
return this.symbol.resolvedBounds.map { it.coneType }
return this.bounds().map { it.coneType }
}
override fun TypeParameterMarker.getTypeConstructor(): TypeConstructorMarker {
@@ -335,7 +335,7 @@ interface ConeTypeContext : TypeSystemContext, TypeSystemOptimizationContext, Ty
override fun TypeParameterMarker.hasRecursiveBounds(selfConstructor: TypeConstructorMarker?): Boolean {
require(this is ConeTypeParameterLookupTag)
return this.typeParameterSymbol.resolvedBounds.any { typeRef ->
return this.bounds().any { typeRef ->
typeRef.coneType.contains { it.typeConstructor() == this.getTypeConstructor() }
&& (selfConstructor == null || typeRef.coneType.typeConstructor() == selfConstructor)
}
@@ -580,10 +580,13 @@ interface ConeTypeContext : TypeSystemContext, TypeSystemOptimizationContext, Ty
override fun TypeParameterMarker.getRepresentativeUpperBound(): KotlinTypeMarker {
require(this is ConeTypeParameterLookupTag)
return this.symbol.resolvedBounds.getOrNull(0)?.coneType
return this.bounds().getOrNull(0)?.coneType
?: session.builtinTypes.nullableAnyType.type
}
@Suppress("NOTHING_TO_INLINE")
private inline fun ConeTypeParameterLookupTag.bounds(): List<FirTypeRef> = symbol.fir.bounds
override fun KotlinTypeMarker.getUnsubstitutedUnderlyingType(): KotlinTypeMarker? {
require(this is ConeKotlinType)
return unsubstitutedUnderlyingTypeForInlineClass(session)
compiler/fir/providers/src/org/jetbrains/kotlin/fir/types/TypeUtils.kt
+2
View File
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.fir.resolve.toSymbol
import org.jetbrains.kotlin.fir.resolvedTypeFromPrototype
import org.jetbrains.kotlin.fir.symbols.ConeTypeParameterLookupTag
import org.jetbrains.kotlin.fir.symbols.impl.*
import org.jetbrains.kotlin.fir.symbols.lazyResolveToPhase
import org.jetbrains.kotlin.fir.types.builder.*
import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl
import org.jetbrains.kotlin.fir.types.impl.ConeTypeParameterTypeImpl
@@ -394,6 +395,7 @@ fun ConeTypeContext.captureArguments(type: ConeKotlinType, status: CaptureStatus
if (oldArgument.kind == ProjectionKind.INVARIANT) continue
val parameter = typeConstructor.getParameter(index)
(parameter as? ConeTypeParameterLookupTag)?.typeParameterSymbol?.lazyResolveToPhase(FirResolvePhase.TYPES)
val upperBounds = (0 until parameter.upperBoundCount()).mapTo(mutableListOf()) { paramIndex ->
substitutor.safeSubstitute(
this as TypeSystemInferenceExtensionContext, parameter.getUpperBound(paramIndex)