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

FIR: precise lookupTag parameter of ConeTypeVariableType as it always accepts ConeTypeVariableTypeConstructor

Browse Source
This commit is contained in:
Ilya Kirillov
2021-09-28 19:13:15 +02:00
committed by TeamCityServer
parent d3913b85cf
commit cdde765ad9
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/ConeTypeCompatibilityChecker.kt
+2 -3
View File
@@ -239,9 +239,8 @@ object ConeTypeCompatibilityChecker {
is ConeClassErrorType -> emptySet() // Ignore error types is ConeClassErrorType -> emptySet() // Ignore error types
is ConeLookupTagBasedType -> when (this) { is ConeLookupTagBasedType -> when (this) {
is ConeClassLikeType -> setOf(this) is ConeClassLikeType -> setOf(this)
is ConeTypeVariableType -> when (val tag = lookupTag) { is ConeTypeVariableType -> {
is ConeTypeVariableTypeConstructor -> (tag.originalTypeParameter as? ConeTypeParameterLookupTag)?.typeParameterSymbol.collectUpperBounds() (lookupTag.originalTypeParameter as? ConeTypeParameterLookupTag)?.typeParameterSymbol.collectUpperBounds()
else -> throw IllegalStateException("missing branch for ${lookupTag.javaClass.name}")
} }
is ConeTypeParameterType -> lookupTag.typeParameterSymbol.collectUpperBounds() is ConeTypeParameterType -> lookupTag.typeParameterSymbol.collectUpperBounds()
else -> throw IllegalStateException("missing branch for ${javaClass.name}") else -> throw IllegalStateException("missing branch for ${javaClass.name}")
compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypes.kt
+1 -1
View File
@@ -226,7 +226,7 @@ data class ConeCapturedType(
data class ConeTypeVariableType( data class ConeTypeVariableType(
override val nullability: ConeNullability, override val nullability: ConeNullability,
override val lookupTag: ConeClassifierLookupTag, override val lookupTag: ConeTypeVariableTypeConstructor,
override val attributes: ConeAttributes = ConeAttributes.Empty, override val attributes: ConeAttributes = ConeAttributes.Empty,
) : ConeLookupTagBasedType() { ) : ConeLookupTagBasedType() {
override val typeArguments: Array<out ConeTypeProjection> get() = emptyArray() override val typeArguments: Array<out ConeTypeProjection> get() = emptyArray()