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

FIR: Fix computing dispatch receiver for property-delegation operators

Browse Source
This commit is contained in:
Denis.Zharkov
2021-04-27 14:15:46 +03:00
committed by teamcityserver
parent 35c754c27c
commit 571c16be52
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirDelegatedPropertyInferenceSession.kt
+2 -4
View File
@@ -5,10 +5,7 @@
package org.jetbrains.kotlin.fir.resolve.inference package org.jetbrains.kotlin.fir.resolve.inference
import org.jetbrains.kotlin.fir.declarations.FirAnonymousObject import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.declarations.FirProperty
import org.jetbrains.kotlin.fir.declarations.FirRegularClass
import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction
import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirExpression
import org.jetbrains.kotlin.fir.expressions.FirResolvable import org.jetbrains.kotlin.fir.expressions.FirResolvable
import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.expressions.FirStatement
@@ -132,6 +129,7 @@ class FirDelegatedPropertyInferenceSession(
?: when (val container = components.container) { ?: when (val container = components.container) {
is FirRegularClass -> container.defaultType() is FirRegularClass -> container.defaultType()
is FirAnonymousObject -> container.defaultType() is FirAnonymousObject -> container.defaultType()
is FirCallableMemberDeclaration<*> -> container.dispatchReceiverType
else -> null else -> null
} ?: components.session.builtinTypes.nullableNothingType.type } ?: components.session.builtinTypes.nullableNothingType.type
val valueParameterForThis = (symbol as? FirFunctionSymbol<*>)?.fir?.valueParameters?.firstOrNull() ?: return val valueParameterForThis = (symbol as? FirFunctionSymbol<*>)?.fir?.valueParameters?.firstOrNull() ?: return