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

[PSI2IR] Synthetic property accessor call adjustment do can't have CR

Browse Source
This commit is contained in:
Anastasiya Shadrina
2021-11-17 18:02:47 +07:00
committed by TeamCityServer
parent 4d0eb74d79
commit 7a86b4f20a
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/intermediate/IrUtils.kt
+3 -1
View File
@@ -29,6 +29,9 @@ fun CallReceiver.adjustForCallee(callee: CallableMemberDescriptor): CallReceiver
object : CallReceiver { object : CallReceiver {
override fun call(withDispatchAndExtensionAndContextReceivers: (IntermediateValue?, IntermediateValue?, List<IntermediateValue>) -> IrExpression): IrExpression = override fun call(withDispatchAndExtensionAndContextReceivers: (IntermediateValue?, IntermediateValue?, List<IntermediateValue>) -> IrExpression): IrExpression =
this@adjustForCallee.call { dispatchReceiverValue, extensionReceiverValue, contextReceiverValues -> this@adjustForCallee.call { dispatchReceiverValue, extensionReceiverValue, contextReceiverValues ->
assert(contextReceiverValues.isEmpty()) {
"Synthetic property accessor call adjustment with context receivers, callee: $callee"
}
val numReceiversPresent = listOfNotNull(dispatchReceiverValue, extensionReceiverValue).size val numReceiversPresent = listOfNotNull(dispatchReceiverValue, extensionReceiverValue).size
val numReceiversExpected = listOfNotNull(callee.dispatchReceiverParameter, callee.extensionReceiverParameter).size val numReceiversExpected = listOfNotNull(callee.dispatchReceiverParameter, callee.extensionReceiverParameter).size
if (numReceiversPresent != numReceiversExpected) if (numReceiversPresent != numReceiversExpected)
@@ -46,7 +49,6 @@ fun CallReceiver.adjustForCallee(callee: CallableMemberDescriptor): CallReceiver
dispatchReceiverValue != null && callee.dispatchReceiverParameter == null -> dispatchReceiverValue dispatchReceiverValue != null && callee.dispatchReceiverParameter == null -> dispatchReceiverValue
else -> extensionReceiverValue else -> extensionReceiverValue
} }
// TODO: Create new context receiver values
withDispatchAndExtensionAndContextReceivers(newDispatchReceiverValue, newExtensionReceiverValue, contextReceiverValues) withDispatchAndExtensionAndContextReceivers(newDispatchReceiverValue, newExtensionReceiverValue, contextReceiverValues)
} }
} }