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

FIR: fix nullability loss on substitution

Browse Source
This commit is contained in:
Simon Ogorodnik
2019-04-17 17:58:55 +03:00
committed by Mikhail Glukhikh
parent 572c9e7115
commit dae5822986
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConeInferenceContext.kt
+1 -1
View File
@@ -271,7 +271,7 @@ interface ConeInferenceContext : TypeSystemInferenceExtensionContext,
TypeSubstitutorMarker { TypeSubstitutorMarker {
override fun substituteType(type: ConeKotlinType): ConeKotlinType? { override fun substituteType(type: ConeKotlinType): ConeKotlinType? {
val new = map[type.typeConstructor()] ?: return null val new = map[type.typeConstructor()] ?: return null
return new as ConeKotlinType return makeNullableIfNeed(type.isMarkedNullable, new as ConeKotlinType)
} }
} }
} }
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/substitution/ConeSubstitutor.kt
+7 -1
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.fir.resolve.substitution package org.jetbrains.kotlin.fir.resolve.substitution
import org.jetbrains.kotlin.fir.resolve.withNullability
import org.jetbrains.kotlin.fir.symbols.ConeTypeParameterSymbol import org.jetbrains.kotlin.fir.symbols.ConeTypeParameterSymbol
import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.fir.types.*
import org.jetbrains.kotlin.fir.types.impl.ConeAbbreviatedTypeImpl import org.jetbrains.kotlin.fir.types.impl.ConeAbbreviatedTypeImpl
@@ -44,6 +45,11 @@ abstract class AbstractConeSubstitutor : ConeSubstitutor {
abstract fun substituteType(type: ConeKotlinType): ConeKotlinType? abstract fun substituteType(type: ConeKotlinType): ConeKotlinType?
fun makeNullableIfNeed(isNullable: Boolean, type: ConeKotlinType?): ConeKotlinType? {
if (!isNullable) return type
return type?.withNullability(ConeNullability.NULLABLE)
}
override fun substituteOrSelf(type: ConeKotlinType): ConeKotlinType { override fun substituteOrSelf(type: ConeKotlinType): ConeKotlinType {
return substituteOrNull(type) ?: type return substituteOrNull(type) ?: type
} }
@@ -124,6 +130,6 @@ class ConeSubstitutorByMap(val substitution: Map<ConeTypeParameterSymbol, ConeKo
override fun substituteType(type: ConeKotlinType): ConeKotlinType? { override fun substituteType(type: ConeKotlinType): ConeKotlinType? {
if (type !is ConeTypeParameterType) return null if (type !is ConeTypeParameterType) return null
return substitution[type.lookupTag] return makeNullableIfNeed(type.isMarkedNullable, substitution[type.lookupTag])
} }
} }