azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions 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
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt
+10 -3
View File
@@ -256,10 +256,17 @@ fun BodyResolveComponents.typeForQualifier(resolvedQualifier: FirResolvedQualifi
fun <T : FirResolvable> BodyResolveComponents.typeFromCallee(access: T): FirResolvedTypeRef { fun <T : FirResolvable> BodyResolveComponents.typeFromCallee(access: T): FirResolvedTypeRef {
val makeNullable: Boolean by lazy { val makeNullable: Boolean by lazy {
if (access is FirQualifiedAccess) if (access is FirQualifiedAccess && access.safe) {
access.safe && access.explicitReceiver!!.resultType.coneTypeUnsafe<ConeKotlinType>().isNullable val explicitReceiver = access.explicitReceiver!!
else val receiverResultType = explicitReceiver.resultType
if (receiverResultType is FirResolvedTypeRef) {
receiverResultType.type.isNullable
} else {
throw AssertionError("Receiver ${explicitReceiver.render()} type is unresolved: ${receiverResultType.render()}")
}
} else {
false false
}
} }
return when (val newCallee = access.calleeReference) { return when (val newCallee = access.calleeReference) {