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

FIR: use dispatch receiver of the enclosing function if any.

Browse Source
This commit is contained in:
Jinseong Jeon
2020-03-24 15:58:40 -07:00
committed by Mikhail Glukhikh
parent a363a5be58
commit de0c9a5c73
47 changed files with 11 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConversionScope.kt
+11 -9
View File
@@ -77,15 +77,17 @@ class Fir2IrConversionScope {
fun parent(): IrDeclarationParent? = parentStack.lastOrNull()
fun lastDispatchReceiverParameter(): IrValueParameter? {
val dispatchReceiver = functionStack.lastOrNull()?.dispatchReceiverParameter
return if (dispatchReceiver != null) {
// Use the dispatch receiver of the containing function
dispatchReceiver
} else {
val lastClassSymbol = classStack.lastOrNull()?.symbol
// Use the dispatch receiver of the containing class
lastClassSymbol?.owner?.thisReceiver
}
var dispatchReceiver = functionStack.lastOrNull()?.dispatchReceiverParameter
// Use the dispatch receiver of the containing function
dispatchReceiver?.let { return it }
// Use the dispatch receiver of the enclosing function if any
dispatchReceiver = functionStack.elementAtOrNull(functionStack.size - 2)?.dispatchReceiverParameter
dispatchReceiver?.let { return it }
// Use the dispatch receiver of the containing class
val lastClassSymbol = classStack.lastOrNull()?.symbol
return lastClassSymbol?.owner?.thisReceiver
}
fun lastClass(): IrClass? = classStack.lastOrNull()