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

FIR: add minor fix of super reference handling

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-05-06 11:43:21 +03:00
parent 7b01cf7b04
commit cd2f5895a6
1 changed files with 5 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
+5 -3
View File
@@ -355,10 +355,12 @@ fun <T : FirResolvable> BodyResolveComponents.typeFromCallee(access: T): FirReso
} }
is FirSuperReference -> { is FirSuperReference -> {
val labelName = newCallee.labelName val labelName = newCallee.labelName
val implicitReceiver = implicitReceiverStack[labelName] as? ImplicitDispatchReceiverValue val implicitReceiver =
if (labelName != null) implicitReceiverStack[labelName] as? ImplicitDispatchReceiverValue
else implicitReceiverStack.lastDispatchReceiver()
val resolvedTypeRef = val resolvedTypeRef =
if (implicitReceiver != null) implicitReceiver.boundSymbol.phasedFir.superTypeRefs.singleOrNull() as? FirResolvedTypeRef newCallee.superTypeRef as? FirResolvedTypeRef
else newCallee.superTypeRef as? FirResolvedTypeRef ?: implicitReceiver?.boundSymbol?.phasedFir?.superTypeRefs?.singleOrNull() as? FirResolvedTypeRef
resolvedTypeRef ?: buildErrorTypeRef { resolvedTypeRef ?: buildErrorTypeRef {
source = newCallee.source source = newCallee.source
diagnostic = ConeUnresolvedNameError(Name.identifier("super")) diagnostic = ConeUnresolvedNameError(Name.identifier("super"))