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

FIR: Avoid creating new stub type constructors on nullability replacing

Browse Source
This commit is contained in:
Simon Ogorodnik
2021-11-15 16:44:17 +03:00
committed by teamcity
parent 61ea65906c
commit 3fadf1cb46
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypes.kt
+19 -4
View File
@@ -353,10 +353,25 @@ sealed class ConeStubType(val constructor: ConeStubTypeConstructor, override val
} }
} }
open class ConeStubTypeForBuilderInference(variable: ConeTypeVariable, nullability: ConeNullability) : open class ConeStubTypeForBuilderInference(constructor: ConeStubTypeConstructor, nullability: ConeNullability) :
ConeStubType(ConeStubTypeConstructor(variable, isTypeVariableInSubtyping = false), nullability) ConeStubType(constructor, nullability) {
class ConeStubTypeForTypeVariableInSubtyping(variable: ConeTypeVariable, nullability: ConeNullability) : constructor(variable: ConeTypeVariable, nullability: ConeNullability) : this(
ConeStubType(ConeStubTypeConstructor(variable, isTypeVariableInSubtyping = true), nullability) ConeStubTypeConstructor(
variable,
isTypeVariableInSubtyping = false
), nullability
)
}
class ConeStubTypeForTypeVariableInSubtyping(constructor: ConeStubTypeConstructor, nullability: ConeNullability) :
ConeStubType(constructor, nullability) {
constructor(variable: ConeTypeVariable, nullability: ConeNullability) : this(
ConeStubTypeConstructor(
variable,
isTypeVariableInSubtyping = true
), nullability
)
}
open class ConeTypeVariable(name: String, originalTypeParameter: TypeParameterMarker? = null) : TypeVariableMarker { open class ConeTypeVariable(name: String, originalTypeParameter: TypeParameterMarker? = null) : TypeVariableMarker {
val typeConstructor = ConeTypeVariableTypeConstructor(name, originalTypeParameter) val typeConstructor = ConeTypeVariableTypeConstructor(name, originalTypeParameter)
compiler/fir/providers/src/org/jetbrains/kotlin/fir/types/TypeUtils.kt
+2 -2
View File
@@ -165,8 +165,8 @@ fun <T : ConeKotlinType> T.withNullability(
ConeNullability.UNKNOWN -> this // TODO: is that correct? ConeNullability.UNKNOWN -> this // TODO: is that correct?
ConeNullability.NOT_NULL -> this ConeNullability.NOT_NULL -> this
} }
is ConeStubTypeForBuilderInference -> ConeStubTypeForBuilderInference(constructor.variable, nullability) is ConeStubTypeForBuilderInference -> ConeStubTypeForBuilderInference(constructor, nullability)
is ConeStubTypeForTypeVariableInSubtyping -> ConeStubTypeForTypeVariableInSubtyping(constructor.variable, nullability) is ConeStubTypeForTypeVariableInSubtyping -> ConeStubTypeForTypeVariableInSubtyping(constructor, nullability)
is ConeDefinitelyNotNullType -> when (nullability) { is ConeDefinitelyNotNullType -> when (nullability) {
ConeNullability.NOT_NULL -> this ConeNullability.NOT_NULL -> this
ConeNullability.NULLABLE -> original.withNullability(nullability, typeContext) ConeNullability.NULLABLE -> original.withNullability(nullability, typeContext)