jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-03-23 08:31:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIR: more accurate type checking in typeFromCallee

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-08-22 15:40:32 +03:00
parent c27ed0cfd3
commit 044dfd14ce
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt
View File

@@ -256,10 +256,17 @@ fun BodyResolveComponents.typeForQualifier(resolvedQualifier: FirResolvedQualifi
fun <T : FirResolvable> BodyResolveComponents.typeFromCallee(access: T): FirResolvedTypeRef {
val makeNullable: Boolean by lazy {
if (access is FirQualifiedAccess)
access.safe && access.explicitReceiver!!.resultType.coneTypeUnsafe<ConeKotlinType>().isNullable
else
if (access is FirQualifiedAccess && access.safe) {
val explicitReceiver = access.explicitReceiver!!
val receiverResultType = explicitReceiver.resultType
if (receiverResultType is FirResolvedTypeRef) {
receiverResultType.type.isNullable
} else {
throw AssertionError("Receiver ${explicitReceiver.render()} type is unresolved: ${receiverResultType.render()}")
}
} else {
false
}
}
return when (val newCallee = access.calleeReference) {