Proper resort variables on inlining lowered ir closures
Original problem is that lowered ir closures doesn't meet inliner expectations
about captured variable position in inlining method.
E.g.: Call 'foo(valueParam) { capturedParam }' to
inline function 'foo' with declaration
inline fun foo(valueParam: Foo, inlineParamWithCaptured: Bar.() ->) ....
is reorganized through inlining to equivalent call foo(valueParam, capturedParam1, cp2 ...).
But lowered closure for lambda parameter has totally different parameters order:
fun loweredLambda$x(extensionReceiver, captured1, cp2..., valueParam1, vp2...)
So before inlining lowered closure should be transformed to
fun loweredLambda$x(extensionReceiver, valueParam1, vp2..., captured1, cp2..)
#KT-28547 Fixed
This commit is contained in:
@@ -418,12 +418,15 @@ class MethodInliner(
|
||||
private val isInliningLambda = nodeRemapper.isInsideInliningLambda
|
||||
|
||||
private fun getNewIndex(`var`: Int): Int {
|
||||
if (inliningContext.isInliningLambda && inliningContext.lambdaInfo is IrExpressionLambda) {
|
||||
val lambdaInfo = inliningContext.lambdaInfo
|
||||
if (inliningContext.isInliningLambda && lambdaInfo is IrExpressionLambda) {
|
||||
if (`var` < parameters.argsSizeOnStack) {
|
||||
if (`var` < capturedParamsSize) {
|
||||
return `var` + realParametersSize
|
||||
}
|
||||
else {
|
||||
val capturedParamsStartIndex =
|
||||
if (lambdaInfo.isExtensionLambda) lambdaInfo.invokeMethod.argumentTypes[0].size else 0 //shift by extension
|
||||
val capturedParamsEndIndex = capturedParamsSize + capturedParamsStartIndex - 1
|
||||
if (`var` in capturedParamsStartIndex..capturedParamsEndIndex) {
|
||||
return `var` + realParametersSize - capturedParamsStartIndex //subtract extension
|
||||
} else if (`var` >= capturedParamsStartIndex) {
|
||||
return `var` - capturedParamsSize
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user